Data checking (3/18)

Data checking