some changes on the validations