OOP homeworks updated