Data checking (16/18)

Data checking