game architecture fix