added more criteria to validator