#1 validations fixed