#3 moved validation to correct method.