diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
index 1c105ba23..6649d091f 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
@@ -1,4 +1,11 @@
 [
+    {
+        "name": "Debug",
+        "code":"debug_hall",
+        "sites": "SPECIAL",
+        "maximumSameName":100,
+        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21]
+    },
     {
         "name":"Fellowship block",
         "code":"fotr_block",
@@ -6,6 +13,14 @@
         "cancelRingBearerSkirmish":true,
         "set":[1, 2, 3]
     },
+    {
+        "name":"PC-Fellowship Block",
+        "code":"pc_fotr_block",
+        "sites":"FELLOWSHIP",
+        "cancelRingBearerSkirmish":true,
+        "set":[1, 2, 3, 21],
+        "banned":["1_40","1_311","2_32","3_42","3_68",]
+    },
     {
         "name":"Fellowship block - Set 1",
         "code":"fotr1_block",
@@ -52,7 +67,8 @@
         "code":"ttt_block",
         "sites":"TWO_TOWERS",
         "cancelRingBearerSkirmish":true,
-        "set":[4, 5, 6]
+        "set":[4, 5, 6],
+        "hall":false
     },
     {
         "name":"Towers block - Set 4",
@@ -76,14 +92,16 @@
         "sites":"TWO_TOWERS",
         "cancelRingBearerSkirmish":true,
         "banned":["1_40", "1_45", "1_80", "1_108", "1_139", "1_234", "1_248", "1_313", "2_32", "2_101", "2_108", "3_38", "3_42", "3_68", "4_192"],
-        "set":[1, 2, 3, 4, 5, 6]
+        "set":[1, 2, 3, 4, 5, 6],
+        "hall":false
     },
     {
         "name": "Anything goes",
         "code":"rev_tow_sta",
         "sites": "SPECIAL",
         "cancelRingBearerSkirmish":true,
-        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21]
+        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21],
+        "hall":false
     },
     {
         "name":"Towers standard - Sets 1-4",
@@ -127,7 +145,8 @@
         "sites":"KING",
         "cancelRingBearerSkirmish":true,
         "banned":["1_40", "1_45","1_80", "1_108", "1_139", "1_195", "1_234", "1_248", "1_313", "2_32", "2_101", "2_108", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108"],
-        "set":[1, 2, 3, 4, 5, 6, 7]
+        "set":[1, 2, 3, 4, 5, 6, 7],
+        "hall":false
     },
     {
         "name":"King block",
@@ -135,7 +154,8 @@
         "sites":"KING",
         "cancelRingBearerSkirmish":true,
         "restricted":["7_49"],
-        "set":[7, 8, 10]
+        "set":[7, 8, 10],
+        "hall":false
     },
     {
         "name":"King block - Set 7",
@@ -159,9 +179,16 @@
         "name":"Movie block",
         "code":"movie",
         "sites":"KING",
-        "banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"],
+        "banned":["1_40", "1_45", "1_80", "1_108", "1_139", "1_195", "1_234", "1_248", "1_313", "2_32", "3_106", "3_108", "3_38", "3_42", "3_67", "3_68", "7_49", "7_96", "8_1", "10_2", "10_91"],
         "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     },
+    {
+        "name":"PC-Movie",
+        "code":"pc_movie",
+        "sites":"KING",
+        "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 21],
+        "banned":["1_40","1_311","2_32","3_42","3_68", "1_45", "1_80", "1_108", "1_139", "1_195", "1_234", "1_248", "1_313", "3_106", "3_108", "3_38", "3_67", "7_49", "7_96", "8_1", "10_2", "10_91"],
+    },
     {
         "name":"Movie block - Sets 1-7",
         "code":"movie7",
@@ -199,34 +226,39 @@
         "code":"war_block",
         "sites":"SHADOWS",
         "restricted":["11_132", "11_100"],
-        "set":[11, 12, 13]
+        "set":[11, 12, 13],
+        "hall":false
     },
     {
         "name":"Hunter block",
         "code":"hunter_block",
         "sites":"SHADOWS",
-        "set":[15, 17, 18]
+        "set":[15, 17, 18],
+        "hall":false
     },
     {
         "name":"War of the Ring standard",
         "code":"war_standard",
         "sites":"SHADOWS",
         "banned":["4_73", "4_276", "4_304", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"],
-        "set":[4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
+        "set":[4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
+        "hall":false
     },
     {
         "name":"Standard",
         "code":"standard",
         "sites":"SHADOWS",
         "banned":["0_1-19", "0_21", "0_22", "0_30-47", "0_62-67", "8_1", "13_188", "11_114", "11_31", "10_11", "15_64", "10_2", "10_91", "11_132", "7_49", "11_100"],
-        "set":[0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+        "set":[0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+        "hall":false
     },
     {
         "name":"Open",
         "code":"open",
         "sites":"SHADOWS",
         "restricted":["1_248", "7_49", "10_2", "10_91", "11_100", "11_132"],
-        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+        "hall":false
     },
     {
         "name":"Expanded",
@@ -236,6 +268,14 @@
         "restricted":["1_40", "1_80", "1_108", "1_139", "1_195", "1_248", "2_32", "2_75", "3_106", "4_276", "4_304"],
         "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
     },
+    {
+        "name":"PC-Expanded",
+        "code":"pc_expanded",
+        "sites":"SHADOWS",
+        "banned":["1_40","1_311","2_32","3_42","3_68","1_45", "1_138", "1_234", "1_313", "1_316", "2_121", "3_17", "3_38", "3_67", "3_108", "3_113", "4_73", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"],
+        "restricted":["1_80", "1_108", "1_139", "1_195", "1_248", "2_75", "3_106", "4_276", "4_304"],
+        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,21]
+    },
     {
         "name":"War of the Ring block - Set 11",
         "code":"war_block11",
@@ -267,7 +307,8 @@
         "banned":["1_138", "1_311", "1_316", "1_331", "1_338", "1_354", "1_355", "1_360", "2_14", "2_75", "3_1", "3_113", "4_73", "4_338", "4_355", "4_357", "7_190", "8_20", "10_11",
             "8_1", "8_3", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234", "7_156"],
         "valid":["0_56-60"],
-        "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+        "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+        "hall":false
     },
     {
         "name":"Movie block, no GLR (10R11)",
@@ -301,7 +342,7 @@
         "limit3":[],
         "set":[30, 31],
         "restrictedName":["Gandalf", "Bilbo"],
-        "hall":true
+        "hall":false
     },
     {
         "name": "Hobbit: The Clouds Burst",
@@ -313,7 +354,7 @@
         "limit3": [],
         "set": [30, 32],
         "restrictedName": ["Gandalf", "Bilbo"],
-        "hall": true
+        "hall":false
     },
     {
         "name": "Hobbit: Fire and Water",
@@ -399,12 +440,5 @@
         "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
         "hall":false
     },
-    {
-        "name":"PC-Fellowship Block",
-        "code":"pc_fotr_block",
-        "sites":"FELLOWSHIP",
-        "cancelRingBearerSkirmish":true,
-        "set":[1, 2, 3, 21],
-        "banned":["1_1"]
-    }
+    
 ]