Regular update
Finishing class validation (Still working)