updated validations
about to revert