Data checking (12/18)

Data checking