Game modified according to OOP