OOP change(some commands still not executing properly)