still refactoring validations