Updated OOP Line up