Made more OOP