Validator and Constraints

i really dunno why git think that this was changed...