switched to OOP