Data checking (11/18)

Data checking