Data checking (7/18)

Data checking