Changed the way the validator works