Reworked Validation