Input data validation added - properly this time