Added OOP Teamwork