diff --git a/src/common/haxe/ru/m/tankz/control/NoneControlFactory.hx b/src/common/haxe/ru/m/tankz/control/NoneControlFactory.hx
index 15450ba..23c9657 100644
--- a/src/common/haxe/ru/m/tankz/control/NoneControlFactory.hx
+++ b/src/common/haxe/ru/m/tankz/control/NoneControlFactory.hx
@@ -1,13 +1,13 @@
 package ru.m.tankz.control;
 
-import ru.m.tankz.game.Player;
+import ru.m.tankz.Type;
 
 
 class NoneControlFactory implements IControlFactory {
 
     public function new() {}
 
-    public function build(player:Player):Control {
+    public function build(id:PlayerId, type:ControlType):Control {
         return null;
     }
 }
diff --git a/src/server/haxe/ru/m/tankz/server/game/GameManager.hx b/src/server/haxe/ru/m/tankz/server/game/GameManager.hx
index cd49670..93f9a5c 100644
--- a/src/server/haxe/ru/m/tankz/server/game/GameManager.hx
+++ b/src/server/haxe/ru/m/tankz/server/game/GameManager.hx
@@ -1,8 +1,8 @@
 package ru.m.tankz.server.game;
 
+import ru.m.tankz.game.GameState;
 import ru.m.tankz.network.NetworkGame;
 import ru.m.tankz.preset.ClassicGame;
-import ru.m.tankz.game.GameSave;
 import ru.m.tankz.proto.pack.StartGameResponse;
 import ru.m.tankz.proto.pack.LeaveGameResponse;
 import ru.m.tankz.proto.pack.JoinGameResponse;
@@ -116,7 +116,7 @@ class GameManager {
     public function start() {
         gameInfo.setState(GameStateProto.STARTED);
         game = new NetworkGame(ClassicGame.TYPE);
-        game.start(new GameSave({type: ClassicGame.TYPE, presetId: ClassicGame.PLAYER1, level: 0}));
+        game.start(new GameState(ClassicGame.TYPE,ClassicGame.PLAYER1));
         timer = new NekoTimer(30);
         timer.run = update;
         broadcast(new Response().setStartGame(new StartGameResponse().setGame(gameInfo)));