more modification to validations