Changes towards a working game logic