Converted to OOP.