added in some validations