Minimal changes, looking into game handler