updated custom validators