diff --git a/src/main/java/edu/rpi/legup/puzzle/skyscrapers/SkyscrapersExporter.java b/src/main/java/edu/rpi/legup/puzzle/skyscrapers/SkyscrapersExporter.java
index e65f45585..dac09bd16 100644
--- a/src/main/java/edu/rpi/legup/puzzle/skyscrapers/SkyscrapersExporter.java
+++ b/src/main/java/edu/rpi/legup/puzzle/skyscrapers/SkyscrapersExporter.java
@@ -15,7 +15,8 @@ protected org.w3c.dom.Element createBoardElement(Document newDocument) {
         SkyscrapersBoard board = (SkyscrapersBoard) puzzle.getTree().getRootNode().getBoard();
 
         org.w3c.dom.Element boardElement = newDocument.createElement("board");
-        boardElement.setAttribute("size", String.valueOf(board.getWidth()));
+        boardElement.setAttribute("width", String.valueOf(board.getWidth()));
+        boardElement.setAttribute("height", String.valueOf(board.getHeight()));
 
         org.w3c.dom.Element cellsElement = newDocument.createElement("cells");
         for (PuzzleElement puzzleElement : board.getPuzzleElements()) {
@@ -29,20 +30,20 @@ protected org.w3c.dom.Element createBoardElement(Document newDocument) {
 
         org.w3c.dom.Element axisEast = newDocument.createElement("axis");
         axisEast.setAttribute("side", "east");
-        for (int i=0; i<board.getWidth(); i++) {
+        for (SkyscrapersClue clue : board.getEastClues()) {
             org.w3c.dom.Element clueElement = newDocument.createElement("clue");
-            clueElement.setAttribute("value", String.valueOf(board.getEastClues().get(i).getData()));
-            clueElement.setAttribute("index", String.valueOf(board.getWestClues().get(i).getData()));
+            clueElement.setAttribute("value", String.valueOf(clue.getData()));
+            clueElement.setAttribute("index", SkyscrapersClue.colNumToString(clue.getIndex()));
             axisEast.appendChild(clueElement);
         }
         boardElement.appendChild(axisEast);
 
         org.w3c.dom.Element axisSouth = newDocument.createElement("axis");
         axisSouth.setAttribute("side", "south");
-        for (int i=0; i<board.getWidth(); i++) {
+        for (SkyscrapersClue clue : board.getSouthClues()) {
             org.w3c.dom.Element clueElement = newDocument.createElement("clue");
-            clueElement.setAttribute("value", String.valueOf(board.getSouthClues().get(i).getData()));
-            clueElement.setAttribute("index", String.valueOf(board.getNorthClues().get(i).getData()));
+            clueElement.setAttribute("value", String.valueOf(clue.getData()));
+            clueElement.setAttribute("index", String.valueOf(clue.getIndex()));
             axisSouth.appendChild(clueElement);
         }
         boardElement.appendChild(axisSouth);