Transitioned to OOP.