new validations, needs to be improved