continue refactor for 1.1.2 server update