diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml
index b2927be2..2fc207bf 100644
Binary files a/PROMS/Formats/fmtall/BNPP1Newall.xml and b/PROMS/Formats/fmtall/BNPP1Newall.xml differ
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index ff22195e..38857e42 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -2766,17 +2766,23 @@ namespace Volian.Print.Library
 					myMsg = myMsg.Replace(@"%c", " ");
 
 				// Top Continue message includes high level step tab and text
-				// - C2019-005 Put in for Barakah Alarms 1-21-2019  
-				// - Top continue message set as: "<Top Message="\b {0}\b0   \ul\b {1}\b0\ulnone  (continued)" HLS="1" Margin="0" />" in the format
-				// - in this case the Message part will Bold the tab and Underline Bold the high level step text
-				//
 				if ((docstyle.Continue.Top.HLS ?? 0) == 1)
 				{
 						myMsg = docstyle.Continue.Top.Message; // reset because we did replace strings in code above
 						ItemInfo parentStep = MyItemInfo.MyHLS; // get the high level step
 						myMsg = string.Format(myMsg, parentStep.CombinedTab, parentStep.DisplayTextKeepSpecialChars);
 				}
-
+				// B2021-138: Top continue message for Barakah Single column New (2021) format was incorrect for some lower
+				//	sub-steps.
+				if ((docstyle.Continue.Top.HLS ?? 0) == 6)
+				{
+					myMsg = docstyle.Continue.Top.Message; // reset because we did replace strings in code above
+					ItemInfo parentStep = MyItemInfo.MyHLS;
+					string ctab = parentStep.CombinedTab;
+					if (!MyItemInfo.MyParent.IsHigh)	// If lower sub-step, get parent substep tab, skipping caution/note if in one of those
+						ctab = (MyItemInfo.IsInCautionOrNote) ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
+					myMsg = string.Format(myMsg, ctab, parentStep.DisplayTextKeepSpecialChars);
+				}
 				// Calvert Alarms, step description have the alarm number as part of the top continue message
 				// Also, if the break is within the CONDITION/RESPONSE, there are continue messages in both columns at the top 
 				// of the table, note that the continue messages WITHIN table are only printed when the