changed data input checking logic to make reporting more accurate