-ADDED Validation (but not full cover)