diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index ad21a47a..64c71707 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -1731,7 +1731,10 @@ namespace Volian.Controls.Library
 			if (CanExpand && Expanded == false)// TODO: May need to do some additional checking for subsections
 			{
 				//vlnStackTrace.ShowStack(">AutoExpand ID {0} - Can {1} Expanded {2}", _MyItem.ItemID, CanExpand, Expanded);
-				Expand((_ContentType >= 20000) || MyItemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format);
+				if(MyStepPanel.AutoExpand)
+					Expand((_ContentType >= 20000) || MyItemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format);
+				else
+					Expand(false);
 				//Console.WriteLine("<AutoExpand ID {0} - Can {1} Expanded {2}",_MyItem.ItemID, CanExpand, Expanded);
 			}
 		}
diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs
index 22b71125..06867163 100644
--- a/PROMS/Volian.Controls.Library/RTBItem.cs
+++ b/PROMS/Volian.Controls.Library/RTBItem.cs
@@ -855,7 +855,10 @@ namespace Volian.Controls.Library
 					//OLD: _MyvlnExpander.Attachment = (itemInfo.MyContent.ContentPartCount == 0);
 					break;
 				case 2: // High level steps with children can expand
-					CanExpand = itemInfo.IsHigh && !MyItemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format && itemInfo.HasChildren; // TemporaryFormat.IsHigh(item); ;
+					if(MyStepPanel.AutoExpand)
+						CanExpand = itemInfo.IsHigh && !MyItemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format && itemInfo.HasChildren; // TemporaryFormat.IsHigh(item); ;
+					else
+						CanExpand = true;
 					break;
 				default://Procedures cannot expand, because they automatically expand
 					CanExpand = false;
diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs
index d24e54dd..243e0ea8 100644
--- a/PROMS/Volian.Controls.Library/StepPanel.cs
+++ b/PROMS/Volian.Controls.Library/StepPanel.cs
@@ -354,6 +354,14 @@ namespace Volian.Controls.Library
 				//// TIMING: DisplayItem.TimeIt("pMyItem End");
 			}
 		}
+		public bool AutoExpand
+		{
+			get
+			{
+				// This is temporary to get the code working for this particular procedure
+				return MyProcedureItemInfo.DisplayNumber != "PMS-810";
+			}
+		}
 		public void Reset()
 		{
 			ItemInfo parent = SelectedItemInfo.ActiveParent as ItemInfo;