fixed OOP homeworks