Data checking (10/18)

Data checking