Some code changes, moved the  handling of a specific game to a different class