refactor game acp (2)