Making some changes to the Validator each method.