Data checking (9/18)

Data checking