Data checking (8/18)

Data checking