diff --git a/lib/services/warpath/battledetect.js b/lib/services/warpath/battledetect.js
index 6048f0b..1fb7e21 100644
--- a/lib/services/warpath/battledetect.js
+++ b/lib/services/warpath/battledetect.js
@@ -174,14 +174,14 @@ class BattleDetect {
     if (roomLevel < 6) {
       return ROOM_DEVELOPING
     }
-    if (!roomObjects.storage && !roomObjects.terminal) {
+    if (!roomObjects.terminal) {
       return ROOM_DEVELOPING
     }
     const towers = roomObjects.tower.length
     if (towers.length < 2) {
       return ROOM_DEVELOPING
     }
-    if (roomLevel < 8 || roomObjects.tower.length < 5) {
+    if (roomLevel < 8 || roomObjects.tower.length < 5 || !roomObjects.storage) {
       return ROOM_ESTABLISHED
     }
     return ROOM_FORTIFIED
diff --git a/warpath-classifications.md b/warpath-classifications.md
index 84a6294..e35dd13 100644
--- a/warpath-classifications.md
+++ b/warpath-classifications.md
@@ -9,9 +9,9 @@ Any classification is automatically upgraded to the next level (including from 5
 ​
 * Neutral - No Owners or Reservers
 * Undefended - Room has no towers.
-* Developing - Is less than RCL6, or does not have at least two towers or storage.
-* Established - At least RCL6 with at least two towers and storage (or terminal).
-* Fortified - At least RCL8 with at least five towers and storage (or terminal).
+* Developing - Is less than RCL6, or does not have at least two towers and terminal.
+* Established - At least RCL6 with at least two towers and terminal.
+* Fortified - At least RCL8 with at least five towers, storage and terminal.
 ​
 ​
 ## Class 5
@@ -68,4 +68,4 @@ OR
 ​
 ## Class 0
 ​
-* Any PVP actions that do not meet above qualifications
\ No newline at end of file
+* Any PVP actions that do not meet above qualifications