diff --git a/game/src/board/mod.rs b/game/src/board/mod.rs
index 39bb14e..3815ae0 100644
--- a/game/src/board/mod.rs
+++ b/game/src/board/mod.rs
@@ -72,11 +72,11 @@ impl Board {
             (Piece::new(PIECE_KNIGHT, PLAYER_DAWN), Hex::from_hex(1, 0)),
             (Piece::new(PIECE_KNIGHT, PLAYER_DAWN), Hex::from_hex(7, 3)),
 
-            (Piece::new(PIECE_TOWER, PLAYER_DAWN), Hex::from_hex(2, 0)),
-            (Piece::new(PIECE_TOWER, PLAYER_DAWN), Hex::from_hex(6, 2)),
+            (Piece::new(PIECE_CASTLE, PLAYER_DAWN), Hex::from_hex(2, 0)),
+            (Piece::new(PIECE_CASTLE, PLAYER_DAWN), Hex::from_hex(6, 2)),
 
-            (Piece::new(PIECE_CASTLE, PLAYER_DAWN), Hex::from_hex(3, 0)),
-            (Piece::new(PIECE_CASTLE, PLAYER_DAWN), Hex::from_hex(5, 1)),
+            (Piece::new(PIECE_TOWER, PLAYER_DAWN), Hex::from_hex(3, 0)),
+            (Piece::new(PIECE_TOWER, PLAYER_DAWN), Hex::from_hex(5, 1)),
 
             (Piece::new(PIECE_DRAGON, PLAYER_DAWN), Hex::from_hex(4, 2)),
             (Piece::new(PIECE_BEHEMOTH, PLAYER_DAWN), Hex::from_hex(4, 1)),
diff --git a/www/js/game.js b/www/js/game.js
index 3c53310..a6e4a38 100644
--- a/www/js/game.js
+++ b/www/js/game.js
@@ -31,11 +31,11 @@ GAME.Board = class {
             { piece:GAME.Const.PieceId.Knight, hex:new MATH.Vec2(1, 0) },
             { piece:GAME.Const.PieceId.Knight, hex:new MATH.Vec2(7, 3) },
 
-            { piece:GAME.Const.PieceId.Tower, hex:new MATH.Vec2(2, 0) },
-            { piece:GAME.Const.PieceId.Tower, hex:new MATH.Vec2(6, 2) },
+            { piece:GAME.Const.PieceId.Castle, hex:new MATH.Vec2(2, 0) },
+            { piece:GAME.Const.PieceId.Castle, hex:new MATH.Vec2(6, 2) },
 
-            { piece:GAME.Const.PieceId.Castle, hex:new MATH.Vec2(3, 0) },
-            { piece:GAME.Const.PieceId.Castle, hex:new MATH.Vec2(5, 1) },
+            { piece:GAME.Const.PieceId.Tower, hex:new MATH.Vec2(3, 0) },
+            { piece:GAME.Const.PieceId.Tower, hex:new MATH.Vec2(5, 1) },
 
             { piece:GAME.Const.PieceId.Dragon, hex:new MATH.Vec2(4, 2) },
             { piece:GAME.Const.PieceId.Behemoth, hex:new MATH.Vec2(4, 1) },
@@ -628,11 +628,10 @@ GAME.Const = {
         new GAME.GamePiece(
             "Knight",
             new GAME.PieceMovement()
-                .add(17)
-                .add(12)
-                .add(17)
-                .add(18)
-                .add(23)
+                .add(6)
+                .add(8)
+                .add(9)
+                .add(11)
                 .add(25)
                 .add(26)
                 .add(28)