OOP tweaks from last session