First class definition
Little changes