Data checking (13/18)

Data checking