OOP Version fix