3.02 OOP fixed