Is now more OO