Data checking (6/18)

Data checking