improvement of data check