Reverted to old OOP methods.