diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml
index a2e3188d..51ad6883 100644
Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ
diff --git a/PROMS/Formats/fmtall/BGEVLall.xml b/PROMS/Formats/fmtall/BGEVLall.xml
index cdeb1e26..34fda5ba 100644
Binary files a/PROMS/Formats/fmtall/BGEVLall.xml and b/PROMS/Formats/fmtall/BGEVLall.xml differ
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 6f0e081f..a9650273 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -1226,6 +1226,18 @@ namespace VEPROMS.CSLA.Library
 				return IsType("Note");
 			}
 		}
+		public bool IsFootnote
+		{
+			get
+			{
+				if (!ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes) return false;
+				if (!IsStep) return false;
+				// BGEVL had notes as footnotes, and also had HorizontalSubsteps flag
+				if (ActiveFormat.PlantFormat.FormatData.PrintData.HorizontalSubsteps && IsType("Note")) return true;
+				if (IsType("Note2")) return true;		// BGEEOP had note2's as footnotes
+				return false;
+			}
+		}
 		public bool IsTable
 		{
 			get
@@ -3396,7 +3408,9 @@ namespace VEPROMS.CSLA.Library
 					}
 					if (!this.FormatStepData.SeparateBox)
 					{
-						if (tbformat == nextTbFormat || tbformat == prevTbFormat)
+						// For calvert formats, if all tabs are null or empty, then don't add a bullet in.
+						bool allnull = ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && (tbformat == null || tbformat == "") && (nextTbFormat == null || tbformat == "") && (prevTbFormat == null || prevTbFormat == "");
+						if (!allnull && (tbformat == nextTbFormat || tbformat == prevTbFormat))
 						{
 							tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
 							TabToIdentBAdjustFont();
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index eb75b192..89c3bcc8 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -729,6 +729,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm");
 			}
 		}
+		private LazyLoad<bool> _HorizontalSubsteps;
+		public bool HorizontalSubsteps
+		{
+			get
+			{
+				return LazyLoad(ref _HorizontalSubsteps, "@HorizontalSubsteps");
+			}
+		}
 		private LazyLoad<bool> _SpecialStepsFoldout;
 		public bool SpecialStepsFoldout
 		{
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index fab4db73..b04f41b2 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -80,7 +80,7 @@ namespace Volian.Print.Library
 			{
 				if(pp != null) pp.OnStatusChanged((iChildItemInfo.DisplayNumber ?? "") == "" ? iChildItemInfo.DisplayText : iChildItemInfo.DisplayNumber, PromsPrinterStatusType.LoadVlnParagraph);
 
-				if (iChildItemInfo.IsNote && iChildItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes)
+				if (iChildItemInfo.IsFootnote)
 				{
 					vlnParagraph para = new vlnParagraph(Parent, cb, iChildItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight, true, iChildItemInfo.IsSection ? pp :null);
 					continue;   // don't add it, vlnParagraph adds this item to the footnote vlntext list in ToPdf.
@@ -2104,10 +2104,9 @@ namespace Volian.Print.Library
 			Suffix = suffix;
 			MyItemInfo = itemInfo;
 			MyContentByte = cb;
-			if (itemInfo.IsNote && itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes)
+			if (itemInfo.IsFootnote)
 			{
-				// notestofootnoteshls may need to be a list, a hls can have more than one note
-				// should it be list of vlntext.
+				// notestofootnoteshls is a list, a hls can have more than one note
 				if (MyPageHelper.NotesToFootNotesHLS.ContainsKey(itemInfo.MyHLS.ItemID))
 					MyPageHelper.NotesToFootNotesHLS[itemInfo.MyHLS.ItemID].Add(itemInfo.ItemID);
 				else