made it more user friendly, class, etc