added new validations, replaced old ones