Data checking (17/18)

Data checking