Add modifications to OOP version