Integrate new design, remove, change and correct some game logic