Changed the OOP style.