Revert 10 feature/8 gameproject