Rework Validation