diff --git a/.github/workflows/testing-GuideConverter.yml b/.github/workflows/testing-GuideConverter.yml
index e45cb6e..7618439 100644
--- a/.github/workflows/testing-GuideConverter.yml
+++ b/.github/workflows/testing-GuideConverter.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
 
       # Any prerequisite steps
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
         
       - name: Checkout guide-getting-started
         uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: OpenLiberty/guides-common
-          path: Guides-common
+          path: guides-common
 
       - uses: actions/setup-java@v1
         with:
@@ -39,3 +39,11 @@ jobs:
 
       - name: Testing with Maven
         run: mvn -Dtest=TestMain test
+
+      - name: Post tests
+        if: always()
+        run: |
+          echo ===testing-clone-method.md===
+          cat testing-clone-method.md
+          echo ===clone.md===
+          cat clone.md
diff --git a/src/main/java/CloudHostedGuideConverter.java b/src/main/java/CloudHostedGuideConverter.java
index 375febb..f053791 100644
--- a/src/main/java/CloudHostedGuideConverter.java
+++ b/src/main/java/CloudHostedGuideConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 IBM Corporation and others.
+ * Copyright (c) 2020, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,115 +22,112 @@ public static void main(String[] args) throws Exception {
 
         String guideName = args[0];
         String branch = args[1];
-        getMD(guideName, branch);
+        String gitLab = args.length > 2 ? args[2] : "cloud-hosted-" + guideName;
+        System.out.println("Converting " + guideName + " on branch " + branch + " to lab " + gitLab);
+        convertToMD(guideName, branch, gitLab);
         System.out.println("Guide converted");
         System.out.println("Find markdown in " + guideName + ".md");
 
     }
 
     // Reads the adoc from github, and writes it to an arraylist
-    public static void getMD(String guideName, String branch) throws IOException {
-        Scanner s = null;
-        FileInputStream ip = null;
-        FileInputStream ips = null;
+    public static void convertToMD(String guideName, String branch, String gitLab) throws IOException {
+        Scanner scanner = null;
+        FileInputStream lrpfis = null;
+        FileInputStream rpfis = null;
 
         try {
             //read adoc file from the open liberty guide
             File guide = new File(guideName + "/README.adoc");
-//            URL url = new URL("https://raw.githubusercontent.com/openliberty/" + guideName + "/" + branch + "/README.adoc");
-            s = new Scanner(guide);
-//          ArrayList for whole text file
-            ArrayList<String> listOfLines = new ArrayList<>();
+            scanner = new Scanner(guide);
+            // ArrayList to hold the whole converted markdown format content
+            ArrayList<String> mdContent = new ArrayList<>();
+            
+            int m = Functions.addSNLMetadata(mdContent, guideName, gitLab);
 
-            String GuideTitle = null;
-            String GuideDescription = null;
+            String guideTitle = null;
+            String guideDescription = null;
 
-            Properties prop = new Properties();
-            Properties props = new Properties();
+            Properties loopReplacementsProps = new Properties();
+            Properties replacementsProps = new Properties();
 
-            ip = new FileInputStream("loopReplacements.properties");
-            ips = new FileInputStream("replacements.properties");
+            lrpfis = new FileInputStream("loopReplacements.properties");
+            rpfis = new FileInputStream("replacements.properties");
 
-            prop.load(ip);
-            props.load(ips);
+            loopReplacementsProps.load(lrpfis);
+            replacementsProps.load(rpfis);
 
+            // write each line into the file
+            while (scanner.hasNextLine()) {
+                String inputLine = scanner.nextLine() + "\n";
 
-//          write each line into the file
-            while (s.hasNextLine()) {
-                String inputLine = s.nextLine() + "\n";
-
+                // process the guide title and description
                 if (inputLine.startsWith("= ")) {
-                    GuideTitle = inputLine;
-                        if (!s.nextLine().isEmpty() || !s.nextLine().isBlank()) {
-                            s.nextLine();
-                            s.nextLine();
-                            GuideDescription = s.nextLine();
-                            GuideDescription = GuideDescription.substring(GuideDescription.lastIndexOf(":") + 1, GuideDescription.length());
-                        }
-                        continue;
+                    guideTitle = inputLine;
+                    if (!scanner.nextLine().isEmpty() || !scanner.nextLine().isBlank()) {
+                        scanner.nextLine();
+                        scanner.nextLine();
+                        guideDescription = scanner.nextLine();
+                        guideDescription = guideDescription.substring(guideDescription.lastIndexOf(":") + 1, guideDescription.length());
                     }
-
-                if (inputLine.equals(GuideDescription)) {
-                    inputLine = "";
+                    continue;
                 }
 
+                // skip the Windows and Mac specific content
                 if (inputLine.startsWith("[.tab_content.windows_section.mac_section]")) {
-
-                    while (!s.nextLine().startsWith("[.tab_content.linux_section]")) {
+                    while (!scanner.nextLine().startsWith("[.tab_content.linux_section]")) {
                         continue;
                     }
                 }
 
-
+                // skip the Windows specific content
                 if (inputLine.startsWith("[.tab_content.windows_section]")) {
-                    while (!s.nextLine().startsWith("[.tab_content.mac_section")) {
+                    while (!scanner.nextLine().startsWith("[.tab_content.mac_section")) {
                         continue;
                     }
                 }
 
-
+                // skip the static guide content that marked by ifndef::cloud-hosted
                 if (inputLine.startsWith("ifndef::cloud-hosted[]")) {
-                    while (!s.nextLine().startsWith("endif::[]")) {
+                    while (!scanner.nextLine().startsWith("endif::[]")) {
                         continue;
                     }
                 }
 
-                listOfLines.add(inputLine);
+                mdContent.add(inputLine);
             }
 
-
-            Functions.addPriorStep1(listOfLines, 0, guideName, GuideTitle, GuideDescription);
             // Runs the src.main.java.Functions.class
-            Functions.ConditionsMethod(listOfLines, guideName, branch, prop, props);
-//            Functions.Next(listOfLines);
-            Functions.end(listOfLines, guideName, GuideTitle);
+            Functions.addPriorStep1(mdContent, m, guideName, guideTitle, guideDescription);
+            Functions.ConditionsMethod(mdContent, guideName, branch, loopReplacementsProps, replacementsProps);
+            Functions.end(mdContent, guideName, guideTitle);
 
-            //String builder to format the arraylist
+            // Convert the listOfLines to StringBuilder
             StringBuilder builder = new StringBuilder();
-            for (String value : listOfLines) {
+            for (String value : mdContent) {
+            	if (value.contains("{: codeblock}"))
+            		continue;
                 builder.append(value);
             }
 
-            String text = builder.toString();
-
-            writeToFile(text, guideName);
+            // Write the converted content to the file
+            writeToFile(builder.toString(), guideName);
 
         } catch (IOException ex) {
             System.out.println(ex);
         } finally {
-            if (s != null) {
-                s.close();
-                ip.close();
-                ips.close();
+            if (scanner != null) {
+                scanner.close();
+                lrpfis.close();
+                rpfis.close();
             }
         }
     }
 
     // append to md file
-    public static void writeToFile(String str, String guideName)
-            throws IOException {
+    public static void writeToFile(String str, String guideName) throws IOException {
         BufferedWriter writer = new BufferedWriter(new FileWriter(guideName + ".md"));
-        writer.append("\n" + str);
+        writer.append(str + "\n");
         writer.close();
     }
 }
diff --git a/src/main/java/Functions.java b/src/main/java/Functions.java
index 1f68d09..b760f9a 100644
--- a/src/main/java/Functions.java
+++ b/src/main/java/Functions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 IBM Corporation and others.
+ * Copyright (c) 2020, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,15 +9,15 @@
  *     IBM Corporation - Initial implementation
  *******************************************************************************/
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.PasswordAuthentication;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Properties;
 import java.util.Scanner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.Arrays;
 
 class LinkSets {
     String linkName;
@@ -136,6 +136,8 @@ public static void addCodeblockAfterMVN(ArrayList<String> listOfLines, int i) {
                             }
                             return;
                         }
+                        // To be removed: - no need to add {: cdodeblock}
+                        /*
                         if (!listOfLines.get(i + 2).startsWith("mvn")) {
                             for (int l = i; l < listOfLines.size(); l++) {
                                 if (listOfLines.get(l).contains("----")) {
@@ -143,6 +145,7 @@ public static void addCodeblockAfterMVN(ArrayList<String> listOfLines, int i) {
                                 }
                             }
                         }
+                        */
                     }
                 }
             }
@@ -182,7 +185,7 @@ public static ArrayList<String> relatedGuides(ArrayList<String> listOfLines, int
             String relatedGuidesName = e.substring(1, e.length() - 1);
             String getTitle = null;
             try {
-                URL url = new URL("https://raw.githubusercontent.com/openliberty/guide-" + relatedGuidesName + "/master/README.adoc");
+                URL url = new URL("https://raw.githubusercontent.com/openliberty/guide-" + relatedGuidesName + "/prod/README.adoc");
                 Scanner s = new Scanner(url.openStream());
                 String inputLine = null;
                 while (s.hasNextLine()) {
@@ -193,7 +196,6 @@ public static ArrayList<String> relatedGuides(ArrayList<String> listOfLines, int
                     }
                 }
             } catch (IOException ex) {
-
                 System.out.println("Guide contains iGuide reference");
             }
             if (getTitle != null) {
@@ -214,7 +216,6 @@ public static ArrayList<String> relatedGuides(ArrayList<String> listOfLines, int
                         }
                     }
                 } catch (IOException ex) {
-
                     System.out.println(ex);
                 }
                 getTitle = getTitle.substring(+8, getTitle.length() - 2);
@@ -241,7 +242,7 @@ public static String Next(ArrayList<String> listOfLines) {
 
         String text = builder.toString();
 
-        String whereToNext = "\n\n<br/>\n## **Where to next?**\n\n" + text;
+        String whereToNext = "\n\n### Where to next?\n\n" + text;
 
         return whereToNext;
 
@@ -267,7 +268,9 @@ public static void removeDiagramReference(ArrayList<String> listOfLines, int i)
         }
     }
 
+    // To be removed - no need to add {: cdodeblock}
     // This is a function that inserts {: cdodeblock} after a codeblock
+    /*
     public static void insertCopyButton(ArrayList<String> listOfLines, int i) {
         ArrayList<String> check = new ArrayList<>();
         int y = 0;
@@ -289,7 +292,8 @@ public static void insertCopyButton(ArrayList<String> listOfLines, int i) {
             }
         }
     }
-
+    */
+    
     // This removes any windows commands that are use in the guides. This is because we use a pre installed environment given to the users online. This environment is a linux OS so there for windwows commands are not required.
     public static void removeWindowsCommand(ArrayList<String> listOfLines, int i) {
         int counters = 0;
@@ -445,7 +449,7 @@ public static void codeInsert(String atIndex, ArrayList<String> listOfLines, Str
                 }
             }
 
-            update(listOfLines, guideName, branch, g, position, hideList);
+            openFile("Update", "start", listOfLines, guideName, branch, g, position, hideList);
 
         } else if (atIndex.startsWith("#Replace")) {
 
@@ -491,7 +495,7 @@ public static void codeInsert(String atIndex, ArrayList<String> listOfLines, Str
                 }
             }
 
-            replace(listOfLines, guideName, branch, g, position, hideList);
+            openFile("Replace", "start", listOfLines, guideName, branch, g, position, hideList);
 
         } else if (atIndex.startsWith("#Update") && position == "finishUpdate") {
 
@@ -537,7 +541,7 @@ public static void codeInsert(String atIndex, ArrayList<String> listOfLines, Str
                 }
             }
 
-            updateFinish(listOfLines, guideName, branch, g, position, hideList);
+            openFile("Update", "finish", listOfLines, guideName, branch, g, position, hideList);
         }
 
     }
@@ -567,6 +571,24 @@ public static void removeLast(String guideName) {
             System.out.println(ex);
         }
     }
+    
+	public static int addSNLMetadata(ArrayList<String> listOfLines, String guideName, String gitLab) {
+		ArrayList<String> temp = new ArrayList<>();
+		Properties vhsdProperties = new Properties();
+		try {
+			vhsdProperties.load(new FileInputStream("version-history-start-date.properties"));
+		} catch (Exception ex) {
+			System.out.println(ex);
+		}
+		temp.add("---\n");
+		temp.add("markdown-version: v1\n");
+		temp.add("title: instructions\n");
+		temp.add("branch: " + vhsdProperties.getProperty(gitLab + ".branch","lab-204-instruction") + "\n");
+		temp.add("version-history-start-date: " + vhsdProperties.getProperty(gitLab + ".start-date", "2022-02-09T14:19:17.000Z") + "\n");
+		temp.add("---\n");
+		listOfLines.addAll(temp);
+		return temp.size();
+	}
 
     public static void addPriorStep1(ArrayList<String> listOfLines, int i, String guideName, String
             GuideTitle, String GuideDescription) {
@@ -612,8 +634,9 @@ public static void commons(ArrayList<String> listOfLines, String guideName, int
 
     // This function adds in the last steps of a guide.
     public static void finish(ArrayList<String> listOfLines, String lastLine, String guideName, int i) {
-        String Summery = "# **Summary**\n\n## **Nice Work!**\n\n" + lastLine;
-        listOfLines.set(i, Summery);
+        //String summary = "::page{title=\"Summary\"}\n\n## **Nice Work!**\n\n" + lastLine;
+        String summary = "# **Summary**\n\n### Nice Work!\n\n" + lastLine;
+        listOfLines.set(i, summary);
     }
 
     public static void end(ArrayList<String> listOfLines, String guideName, String GuideTitle) {
@@ -626,13 +649,58 @@ public static void end(ArrayList<String> listOfLines, String guideName, String G
 
         System.out.println(FeedbackLink);
 
-        listOfLines.add("\n<br/>\n## **Clean up your environment**\n\n\nClean up your online environment so that it is ready to be used with the next guide:\n\nDelete the **" + guideName + "** project by running the following commands:\n\n```\ncd /home/project\nrm -fr " + guideName + "\n```\n{: codeblock}\n\n" +
-                "<br/>\n## **What did you think of this guide?**\n\nWe want to hear from you. To provide feedback, click the following link.\n\n" + "* [Give us feedback](" +  FeedbackLink + ")" + "\n\nOr, click the **Support/Feedback** button in the IDE and select the **Give feedback** option. Fill in the fields, choose the **General** category, and click the **Post Idea** button.\n\n" +
-                "<br/>\n## **What could make this guide better?**\n\nYou can also provide feedback or contribute to this guide from GitHub.\n* [Raise an issue to share feedback.](https://github.com/OpenLiberty/" + guideName + "/issues)\n" + "* [Create a pull request to contribute to this guide.](https://github.com/OpenLiberty/" + guideName + "/pulls)\n\n" +
+        listOfLines.add("\n### Clean up your environment\n\n\nClean up your online environment so that it is ready to be used with the next guide:\n\nDelete the ***" + guideName + "*** project by running the following commands:\n\n```bash\ncd /home/project\nrm -fr " + guideName + "\n```\n\n" +
+                "### What did you think of this guide?\n\nWe want to hear from you. To provide feedback, click the following link.\n\n" + "* [Give us feedback](" +  FeedbackLink + ")" + "\n\nOr, click the **Support/Feedback** button in the IDE and select the **Give feedback** option. Fill in the fields, choose the **General** category, and click the **Post Idea** button.\n\n" +
+                "### What could make this guide better?\n\nYou can also provide feedback or contribute to this guide from GitHub.\n* [Raise an issue to share feedback.](https://github.com/OpenLiberty/" + guideName + "/issues)\n" + "* [Create a pull request to contribute to this guide.](https://github.com/OpenLiberty/" + guideName + "/pulls)\n\n" +
                 Next(listOfLines) + "\n\n" +
-                "<br/>\n## **Log out of the session**\n\nLog out of the cloud-hosted guides by selecting **Account** > **Logout** from the Skills Network menu.");
+                "### Log out of the session\n\nLog out of the cloud-hosted guides by selecting **Account** > **Logout** from the Skills Network menu.");
     }
 
+    private static String getFilePath(ArrayList<String> listOfLines, int i) {
+        String filePath = null;
+        for (int x = i; x <= i + 10; x++) {
+            if (listOfLines.get(x).startsWith("include") && !listOfLines.get(x).startsWith("include::{common-includes}")) {
+            	filePath = listOfLines.get(x);
+                filePath = filePath.substring(9, filePath.length() - 3);
+            }
+        }
+        return filePath == null ? "unknown" : listOfLines.get(i).replaceAll("`", "").trim();
+    }
+    
+    private static String getIncludeFile(ArrayList<String> listOfLines, int i) {
+        String filePath = null;
+        for (int x = i; x <= i + 10; x++) {
+            if (listOfLines.get(x).startsWith("include") && !listOfLines.get(x).startsWith("include::{common-includes}")) {
+            	filePath = listOfLines.get(x);
+                filePath = filePath.substring(9, filePath.length() - 3);
+                return filePath.trim();
+            }
+        }
+        return "unknown";
+    }
+    
+    private static String openFile(String guideName, String filePath, String fromDir) {
+    	File f = new File(filePath);
+		return "\n> To open the " + f .getName() + " file in your IDE, select\n" + 
+                "> **File** > **Open** > " + guideName + "/" + fromDir + "/" + filePath.replaceAll("\\*\\*", "") +
+                ", or click the following button\n\n" + 
+                "::openFile{path=\"/home/project/" + guideName + "/" + fromDir + "/" + filePath + "\"}" +
+                "\n\n\n";
+    }
+    
+    //configures instructions to open file for replace and update
+    public static String openFile(String instruction, String fromDir, ArrayList<String> listOfLines, String guideName, String branch, int i, String
+            position, ArrayList<String> hideList) {
+        String filePath = getFilePath(listOfLines, i);
+        String includeFile = getIncludeFile(listOfLines, i);
+        lowercaseKeyword(instruction, listOfLines, i);
+        listOfLines.set(i, openFile(guideName, filePath, fromDir));
+        codeSnippet(listOfLines, guideName, branch, i + 2, includeFile, hideList);
+        position = "main";
+        return position;
+    }
+
+    /* To be removed
     //configures instructions to replace file
     public static String replace(ArrayList<String> listOfLines, String guideName, String branch, int i, String
             position, ArrayList<String> hideList) {
@@ -651,7 +719,7 @@ public static String replace(ArrayList<String> listOfLines, String guideName, St
 
         listOfLines.set(i, listOfLines.get(i).replaceAll("#", ""));
         listOfLines.set(i, listOfLines.get(i).replaceAll("`", "**"));
-        listOfLines.set(i, "\n> From the menu of the IDE, select \n" + "> **File** > **Open** > " + guideName + "/start/" + listOfLines.get(i).replaceAll("\\*\\*", "") + "\n\n\n");
+        listOfLines.set(i, "\n> From the menu of the IDE, select\n" + "> **File** > **Open** > " + guideName + "/start/" + listOfLines.get(i).replaceAll("\\*\\*", "") + "\n\n\n");
         listOfLines.set(i, listOfLines.get(i).replaceAll("touch ", ""));
         codeSnippet(listOfLines, guideName, branch, i + 2, str, hideList);
         position = "main";
@@ -678,7 +746,7 @@ public static String update(ArrayList<String> listOfLines, String guideName, Str
         }
         listOfLines.set(i, listOfLines.get(i).replaceAll("#", ""));
         listOfLines.set(i, listOfLines.get(i).replaceAll("`", "**"));
-        listOfLines.set(i, "\n> From the menu of the IDE, select \n" + "> **File** > **Open** > " + guideName + "/start/" + listOfLines.get(i).replaceAll("\\*\\*", "") + "\n\n\n");
+        listOfLines.set(i, "\n> From the menu of the IDE, select\n" + "> **File** > **Open** > " + guideName + "/start/" + listOfLines.get(i).replaceAll("\\*\\*", "") + "\n\n\n");
         listOfLines.set(i, listOfLines.get(i).replaceAll("touch ", ""));
         codeSnippet(listOfLines, guideName, branch, i + 2, str, hideList);
         position = "main";
@@ -704,32 +772,33 @@ public static String updateFinish(ArrayList<String> listOfLines, String guideNam
         }
         listOfLines.set(i, listOfLines.get(i).replaceAll("#", ""));
         listOfLines.set(i, listOfLines.get(i).replaceAll("`", "**"));
-        listOfLines.set(i, "\n> From the menu of the IDE, select \n" + "> **File** > **Open** > " + guideName + "/finish/" + listOfLines.get(i).replaceAll("\\*\\*", "") + "\n\n\n");
+        listOfLines.set(i, "\n> From the menu of the IDE, select\n" + "> **File** > **Open** > " + guideName + "/finish/" + listOfLines.get(i).replaceAll("\\*\\*", "") + "\n\n\n");
         listOfLines.set(i, listOfLines.get(i).replaceAll("touch ", ""));
         codeSnippet(listOfLines, guideName, branch, i + 2, str, hideList);
         position = "main";
         return position;
     }
+    */
 
     //configures instructions to create file
     public static String touch(ArrayList<String> listOfLines, String guideName, String branch, int i, String
             position, ArrayList<String> hideList) {
-        String str = null;
-        for (int x = i; x <= i + 10; x++) {
-            if (listOfLines.get(x).startsWith("include") && !listOfLines.get(x).startsWith("include::{common-includes}")) {
-
-                str = listOfLines.get(x);
-                str = str.substring(9, str.length() - 3);
-            }
-        }
+ 
+        String filePath = getFilePath(listOfLines, i);
+        String includeFile = getIncludeFile(listOfLines, i);
+        File f = new File(filePath);
 
         lowercaseKeyword("Create", listOfLines, i);
 
-        if (str == null) {
-            str = "finish/" + listOfLines.get(i).replaceAll("`", "");
-        }
-        listOfLines.set(i, "\n> Run the following touch command in your terminal\n" + "```\ntouch /home/project/" + guideName + "/start/" + listOfLines.get(i).replaceAll("`", "") + "```\n{: codeblock}\n\n" + "\n> Then from the menu of the IDE, select **File** > **Open** > " + guideName + "/start/" + listOfLines.get(i).replaceAll("`", "") + "\n\n\n");
-        codeSnippet(listOfLines, guideName, branch, i + 2, str, hideList);
+        listOfLines.set(i,
+            "\n> Run the following touch command in your terminal\n" + 
+            "```bash\ntouch /home/project/" + guideName + "/start/" + listOfLines.get(i).replaceAll("`", "") + "```\n\n" +
+            "\n> Then, to open the " + f.getName() + " file in your IDE, select" +
+            "\n> **File** > **Open** > " + guideName + "/start/" + filePath + 
+            ", or click the following button\n\n" + 
+            "::openFile{path=\"/home/project/" + guideName + "/start/" + filePath + "\"}" +
+            "\n\n\n");
+        codeSnippet(listOfLines, guideName, branch, i + 2, includeFile, hideList);
         position = "main";
         return position;
     }
@@ -758,17 +827,17 @@ public static void link(ArrayList<String> listOfLines, int i) {
                 listOfLines.set(i, listOfLines.get(i).replaceAll(link + "\\[" + description + "\\^\\]", ""));
                 if (listOfLines.get(i).contains("admin")) {
                     localhostSplit[0] = localhostSplit[0].replaceAll("\\[(.*?)\\^\\]", "");
-                    listOfLines.set(i, "\n" + fullText + ("\n\n_To see the output for this URL in the IDE, run the following command at a terminal:_\n\n```\ncurl -k -u admin " + appendJQ(link) + "\n```\n{: codeblock}\n\n\n"));
+                    listOfLines.set(i, "\n" + fullText + ("\n\n_To see the output for this URL in the IDE, run the following command at a terminal:_\n\n```bash\ncurl -k -u admin " + appendJQ(link) + "\n```\n\n\n"));
                     ifAdminLink(listOfLines, listOfLines.size(), link);
                 } else if (localhostSplit.length >= 2) {
-                    listOfLines.set(i, "\n" + fullText + ("\n\n_To see the output for this URL in the IDE, run the following command at a terminal:_\n\n```\ncurl " + appendJQ(link) + "\n```\n{: codeblock}\n\n\n"));
+                    listOfLines.set(i, "\n" + fullText + ("\n\n_To see the output for this URL in the IDE, run the following command at a terminal:_\n\n```bash\ncurl " + appendJQ(link) + "\n```\n\n\n"));
                 } else {
-                    listOfLines.set(i, "\n" + fullText + ("\n\n_To see the output for this URL in the IDE, run the following command at a terminal:_\n\n```\ncurl " + appendJQ(link) + "\n```\n{: codeblock}\n\n\n"));
+                    listOfLines.set(i, "\n" + fullText + ("\n\n_To see the output for this URL in the IDE, run the following command at a terminal:_\n\n```bash\ncurl " + appendJQ(link) + "\n```\n\n\n"));
                 }
                 return;
             } else {
                 if (!listOfLines.get(i).contains("curl")) {
-                    listOfLines.set(i, "\n" + listOfLines.get(i).replaceAll(link + "\\[" + description + "\\^\\]", link) + "\n\n_To see the output for this URL in the IDE, run the following command at a terminal:_\n\n```\ncurl " + appendJQ(link) + "\n```\n{: codeblock}\n\n\n");
+                    listOfLines.set(i, "\n" + listOfLines.get(i).replaceAll(link + "\\[" + description + "\\^\\]", link) + "\n\n_To see the output for this URL in the IDE, run the following command at a terminal:_\n\n```bash\ncurl " + appendJQ(link) + "\n```\n\n");
                 }
             }
         }
@@ -844,13 +913,28 @@ public static ArrayList<String> mains(ArrayList<String> listOfLines, Properties
     //inserts code snippet (Finds the right code snippet and inserts it into the text
     public static ArrayList<String> codeSnippet(ArrayList<String> listOfLines, String guideName, String branch,
                                                 int i, String path, ArrayList<String> hideList) {
+    	String p = path.trim();
         try {
             ArrayList<String> code = new ArrayList<String>();
-            URL url = new URL("https://raw.githubusercontent.com/openliberty/" + guideName + "/" + branch + "/" + path);
+            URL url = new URL("https://raw.githubusercontent.com/openliberty/" + guideName + "/" + branch + "/" + p);
             Scanner s = new Scanner(url.openStream());
             String inputLine = null;
             code.add("\n");
-            code.add("```\n");
+            if (p.endsWith(".java")) {
+                code.add("```java\n");
+            } else if((p.endsWith(".js"))) {
+                code.add("```javascript\n");
+            } else if((p.endsWith(".json"))) {
+                code.add("```json\n");
+            } else if((p.endsWith(".xml"))) {
+                code.add("```xml\n");
+            } else if((p.endsWith(".yaml"))) {
+                code.add("```yaml\n");
+            } else if((p.endsWith(".html"))) {
+                code.add("```html\n");
+            } else {
+                code.add("```\n");
+            }
             while (s.hasNextLine()) {
                 inputLine = s.nextLine() + "\n";
 
@@ -869,7 +953,6 @@ public static ArrayList<String> codeSnippet(ArrayList<String> listOfLines, Strin
 
                 if (hideList != null) {
                     for (String e : newList) {
-
                         if (inputLine.contains("tag::" + e)) {
                             while (!s.nextLine().contains("end::" + e)) {
                                 continue;
@@ -892,6 +975,13 @@ public static ArrayList<String> codeSnippet(ArrayList<String> listOfLines, Strin
                 if (inputLine.contains("# end::")) {
                     inputLine = "";
                 }
+                
+                if (inputLine.contains("<!-- tag::")) {
+                    inputLine = "";
+                }
+                if (inputLine.contains("<!-- end::")) {
+                    inputLine = "";
+                }
 
                 if (!inputLine.replaceAll(" ", "").startsWith("//")) {
                     if (!inputLine.startsWith("#")) {
@@ -914,10 +1004,9 @@ public static ArrayList<String> codeSnippet(ArrayList<String> listOfLines, Strin
                 }
             }
 
-            code.add("```\n{: codeblock}\n\n\n");
+            code.add("```\n\n\n");
             listOfLines.addAll(i, code);
         } catch (IOException ex) {
-
             System.out.println(ex);
         }
         return listOfLines;
@@ -1023,10 +1112,18 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
                 Matcher m5 = r5.matcher(listOfLines.get(i));
 
                 if (m2.find() && !m5.find()) {
-                    listOfLines.set(i, listOfLines.get(i).replaceAll("`", "**"));
-                }
+                	String s = listOfLines.get(i).replaceAll("`", "***");
 
+                	// special handle "***<"
+                    if (s.contains("***") && s.contains("<")) {
+                    	s = s.replace("<", "\\<");
+                    	s = s.replace(">", "\\>");
+                    }
+                    
+                	listOfLines.set(i, s);
+                }
 
+                	
                 OverridingEquals c1 = new OverridingEquals(listOfLines.get(i));
                 OverridingEquals c2 = new OverridingEquals(codes);
 
@@ -1071,9 +1168,18 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
 
 
                 //For parts of text that need to be copied
-                if (listOfLines.get(i).startsWith("[role='command']") || listOfLines.get(i).startsWith("[role=command]")) {
-                    insertCopyButton(listOfLines, i);
-                }
+                if (listOfLines.get(i).startsWith("[role='command']") || 
+                    listOfLines.get(i).startsWith("[role=\"command\"") || 
+                    listOfLines.get(i).startsWith("[role=command]")) {
+                    // To be removed - no need to add {: cdodeblock}
+                    //insertCopyButton(listOfLines, i);
+                	if (listOfLines.get(i+1).startsWith("```")) {
+                		listOfLines.set(i+1, listOfLines.get(i+1).replace("```", "```bash"));
+                	} else if (listOfLines.get(i+1).startsWith("----")) {
+                		listOfLines.set(i+1, listOfLines.get(i+1).replace("----", "```bash"));
+                	}
+                }
+                
 
                 //User is instructed to replace a file
                 if (listOfLines.get(i).startsWith("#Replace") || listOfLines.get(i).startsWith("#Create") || listOfLines.get(i).startsWith("#Update")) {
@@ -1084,7 +1190,7 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
 
                 if (listOfLines.get(i).startsWith("image::")) {
 
-                    String imageRepoLink = "https://raw.githubusercontent.com/OpenLiberty/" + guideName + "/master/assets";
+                    String imageRepoLink = "https://raw.githubusercontent.com/OpenLiberty/" + guideName + "/prod/assets";
 
                     String imageName = listOfLines.get(i).substring(listOfLines.get(i).indexOf("::") + 2, listOfLines.get(i).indexOf("["));
 
@@ -1243,7 +1349,7 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
                     finish(listOfLines, lastLine, guideName, i);
                 }
 
-//            //Identifies the start of a table
+               //Identifies the start of a table
                 if (listOfLines.get(i).startsWith("[cols")) {
                     listOfLines.set(i, "");
                 }
@@ -1269,6 +1375,8 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
                     }
                 }
 
+                // To be removed - no need to use backtick for string contain underscore character
+                /*
                 String pattern3 = "\\*\\*((?:(?!\\*\\*)[^_])*)_(.*?)\\*\\*";
 
                 Pattern r3 = Pattern.compile(pattern3);
@@ -1287,7 +1395,10 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
                         }
                     }
                 }
+                */
 
+                // To be removed - no need to use backtick for string contain < or > characters
+                /*
                 String pattern11 = "\\*\\*<(.*?)>\\*\\*|\\*\\*\\[(.*?)<(.*?)>(.*?)\\]\\*\\*";
 
                 Pattern r11 = Pattern.compile(pattern11);
@@ -1304,6 +1415,7 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
                         listOfLines.set(i, listOfLines.get(i).replaceAll("\\*\\*\\[(.*?)<(.*?)>(.*?)\\]\\*\\*", s));
                     }
                 }
+                */
 
                 String pattern12 = "\\*\\*`((?:(?!\\*\\*))*)(.*?)(?!`)\\*\\*\\s";
 
@@ -1326,12 +1438,15 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
                     }
                 }
 
+                // To be removed - no need to add {: codeblock}
+                /*
                 if (listOfLines.get(i).startsWith("docker")) {
                     if (!listOfLines.get(i + 1).startsWith("{: codeblock}") && listOfLines.get(i + 2).isBlank()) {
                         listOfLines.add(i + 2, "");
                         listOfLines.set(i + 2, "{: codeblock}\n\n\n");
                     }
                 }
+                */
 
                 String pattern7 = "(?m)^(.\s)$";
                 String pattern8 = "(?m)^(.)$";
@@ -1354,6 +1469,8 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
                     }
                 }
 
+                // To be removed - no need to add {: codeblock}
+                /*
                 if (listOfLines.get(i).startsWith("mvn")) {
                     if (!listOfLines.get(i + 2).startsWith("{: codeblock}") && listOfLines.get(i + 2).isBlank()) {
                         if (!listOfLines.get(i + 3).startsWith("{: codeblock}") && listOfLines.get(i + 2).isBlank()) {
@@ -1362,6 +1479,7 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
                         }
                     }
                 }
+                */
 
                 addCodeblockAfterMVN(listOfLines, i);
 
@@ -1380,25 +1498,62 @@ public static void ConditionsMethod(ArrayList<String> listOfLines, String guideN
 
                 if (listOfLines.get(i).startsWith("#")) {
                     if (!listOfLines.get(i).contains("**")) {
-                        String HSize = listOfLines.get(i).substring(0, listOfLines.get(i).lastIndexOf("#") + 1);
-                        String heading = listOfLines.get(i).substring(listOfLines.get(i).lastIndexOf("#") + 2, listOfLines.get(i).length() - 1);
-                        heading = HSize + " **" + heading + "**\n";
-                        if (listOfLines.get(i).contains("Welcome to the")) {
-                            heading = listOfLines.get(i).substring(listOfLines.get(i).lastIndexOf("#") + 2, listOfLines.get(i).lastIndexOf("!") + 1);
-                            String desc = listOfLines.get(i).substring(listOfLines.get(i).lastIndexOf("!") + 1);
-                            heading = HSize + " **" + heading + "**" + desc;
-                        }
-                        listOfLines.set(i, heading);
+                    	if (listOfLines.get(i).startsWith("# ") &&
+                    		!listOfLines.get(i).startsWith("# TYPE ") &&  // for mp-metric guide
+                    		!listOfLines.get(i).startsWith("# HELP ")     // for mp-metric guide
+                    	   ) {
+                    		String heading = listOfLines.get(i);
+                    		heading = heading.replace("# ", "::page{title=\"");
+                            heading = heading.replace("\n",  "\"}\n");
+                            listOfLines.set(i, heading);
+                    	} 
+                    	// To be removed - no need to bold the section title
+                    	/*
+                    	else {
+                            String HSize = listOfLines.get(i).substring(0, listOfLines.get(i).lastIndexOf("#") + 1);
+                            String heading = listOfLines.get(i).substring(listOfLines.get(i).lastIndexOf("#") + 2, listOfLines.get(i).length() - 1);
+                            heading = HSize + " **" + heading + "**\n";
+                            listOfLines.set(i, heading);
+                    	}
+                    	*/
+                    } else if (listOfLines.get(i).contains("# **Summary**")) {
+                    	String heading = listOfLines.get(i);
+                    	heading = heading.replace("# **Summary**", "::page{title=\"Summary\"}");
+                    	listOfLines.set(i, heading);
                     }
                 }
 
                 if (listOfLines.get(i).startsWith("NO_COPY")) {
                     listOfLines.set(i, "");
+// To be removed when SNL fix no copy button block
+/*
+                    // Reformat the no copy code block
+                    boolean change = false;
+                    for (int j = i + 1; j < i + 20; j++) {
+                    	if (!change && listOfLines.get(j).startsWith("----")) {
+                    		change = true;
+                    		listOfLines.set(j, ">\n");
+                    		continue;
+                    	}
+                    	if (change) {
+                        	if (listOfLines.get(j).startsWith("----")) {
+                        		change = false;
+                        		listOfLines.set(j, ">\n");
+                        		break;
+                        	}
+                    		String changed = ">" + listOfLines.get(j);
+                    		listOfLines.set(j, changed);
+                    	}
+                    }
+ */
                 }
 
+                // To be removed
+                /*
                 if (listOfLines.get(i).startsWith("##")) {
                     listOfLines.set(i, "<br/>\n" + listOfLines.get(i));
                 }
+                */
 
                 if (listOfLines.get(i).contains(": codeblock")) {
                     String pattern6 = "(?m)^: codeblock$";
diff --git a/src/main/java/ImportFunctions.java b/src/main/java/ImportFunctions.java
index 5698219..a6469ac 100644
--- a/src/main/java/ImportFunctions.java
+++ b/src/main/java/ImportFunctions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 IBM Corporation and others.
+ * Copyright (c) 2020, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,23 +21,25 @@ public class ImportFunctions {
     // inserts gitclone.aoc from https://github.com/OpenLiberty/guides-common
     public static void clone(ArrayList<String> listOfLines, String guideName, int i, String CommonURL) {
         ArrayList<String> temp = new ArrayList<>();
+        File common = new File("guides-common/cloud-hosted/" + CommonURL);
+        Scanner scanner = null;
         try {
-            File common = new File("Guides-common/cloud-hosted/" + CommonURL);
-//            URL url = new URL(CommonURL);
-//            Scanner s = new Scanner(url.openStream());
-            Scanner s = new Scanner(common);
+            scanner = new Scanner(common);
             String inputLine = null;
             int counter = 0;
-            while (s.hasNextLine()) {
-                inputLine = s.nextLine() + "\n";
+            while (scanner.hasNextLine()) {
+                inputLine = scanner.nextLine() + "\n";
+                if (inputLine.contains("{: codeblock}")) {
+                	continue;
+                }
                 if (inputLine.startsWith("----")) {
                     counter++;
                 }
                 if (counter == 1) {
-                    inputLine = inputLine.replaceAll("----", "```");
+                    inputLine = inputLine.replaceAll("----", "```bash");
                 }
                 if (counter == 2) {
-                    inputLine = inputLine.replaceAll("----", "```\n{: codeblock}\n");
+                    inputLine = inputLine.replaceAll("----", "```\n");
                     counter = 0;
                 }
                 inputLine = inputLine.replace("guide-{projectid}", guideName);
@@ -45,10 +47,11 @@ public static void clone(ArrayList<String> listOfLines, String guideName, int i,
             }
             temp.subList(0, 7).clear();
             listOfLines.addAll(i + 1, temp);
-
-            s.close();
         } catch (IOException ex) {
             System.out.println(ex);
+        } finally {
+        	if (scanner != null)
+        		scanner.close();
         }
     }
 
@@ -66,19 +69,15 @@ public static void KubeStart(ArrayList<String> listOfLines, String guideName, in
 //            Scanner s = new Scanner(url.openStream());
             Scanner s = new Scanner(common);
             String inputLine = null;
-            int counter = 0;
 
             while (s.hasNextLine()) {
                 inputLine = s.nextLine() + "\n";
 
-                boolean remove = false;
-
                 if (inputLine.startsWith("////")) {
                     continue;
                 }
 
                 if (inputLine.startsWith("[.tab_content.windows_section.mac_section]")) {
-                    remove = true;
                     while (!s.nextLine().startsWith("[.tab")) {
                         continue;
                     }
@@ -113,7 +112,7 @@ public static void KubeStart(ArrayList<String> listOfLines, String guideName, in
     public static void OtherGuidesCommon(ArrayList<String> listOfLines, String guideName, int i, String CommonURL) {
         ArrayList<String> temp = new ArrayList<>();
         try {
-            File common = new File("Guides-common/" + CommonURL);
+            File common = new File("guides-common/" + CommonURL);
 //            URL url = new URL(CommonURL);
 //            Scanner s = new Scanner(url.openStream());
             Scanner s = new Scanner(common);
@@ -134,7 +133,7 @@ public static void OtherGuidesCommon(ArrayList<String> listOfLines, String guide
     public static void newTerminal(ArrayList<String> listOfLines, int i, String CommonURL) {
         ArrayList<String> temp = new ArrayList<>();
         try {
-            File common = new File("Guides-common/cloud-hosted/" + CommonURL);
+            File common = new File("guides-common/cloud-hosted/" + CommonURL);
             int x = i;
             Scanner s = new Scanner(common);
             String inputLine = null;
@@ -156,7 +155,7 @@ public static void newTerminal(ArrayList<String> listOfLines, int i, String Comm
     public static void beforeStart(ArrayList<String> listOfLines, int i, String CommonURL, String guideName, String GuideTitle , String GuideDescription) {
         ArrayList<String> temp = new ArrayList<>();
         try {
-            File common = new File("Guides-common/cloud-hosted/" + CommonURL);
+            File common = new File("guides-common/cloud-hosted/" + CommonURL);
             int x = i;
             Scanner s = new Scanner(common);
             String inputLine = null;
@@ -164,11 +163,15 @@ public static void beforeStart(ArrayList<String> listOfLines, int i, String Comm
             GuideTitle = GuideTitle.substring(2, GuideTitle.length());
             while (s.hasNextLine()) {
                 inputLine = s.nextLine() + "\n";
-
                 if(inputLine.startsWith("# Welcome to the cloud-hosted guide!")) {
-                    inputLine = inputLine.replaceAll("cloud-hosted guide!", GuideTitle.trim() + " guide!\n\n" + GuideDescription.trim());
+                	inputLine = inputLine.replaceAll("cloud-hosted guide!", GuideTitle.trim() + " guide!");
+                    temp.add(inputLine);
+                    temp.add("\n");
+                    temp.add(GuideDescription);
+                    temp.add("\n");
+                } else {
+                    temp.add(inputLine);
                 }
-                temp.add(inputLine);
             }
             temp.add("\n");
             temp.add("\n");
diff --git a/src/test/java/src/test/java/TestMain.java b/src/test/java/src/test/java/TestMain.java
index 2f3a9e1..7d2a8b1 100644
--- a/src/test/java/src/test/java/TestMain.java
+++ b/src/test/java/src/test/java/TestMain.java
@@ -26,7 +26,7 @@ public class TestMain {
     @Test
     public void testCompareGuide() throws Exception {
 
-        String[] guide = {"guide-getting-started", "master"};
+        String[] guide = {"guide-getting-started", "prod"};
 
         CloudHostedGuideConverter.main(guide);
 
@@ -264,32 +264,27 @@ public void testremoveDiagramReference() throws IOException {
     public void testClone() throws IOException {
         try {
 
-            File newGuide = new File("testing-clone-method.md");
-            File testingGuide = new File("clone.md");
+            File testingGuide = new File("testing-clone-method.md");
+            File newGuide = new File("clone.md");
 
             String CommonURL = "include::{common-includes}/gitclone.adoc[]";
 
             String GuidesCommon = CommonURL.substring(27, CommonURL.length() - 2);
 
             ArrayList<String> listOfLines = new ArrayList<>();
-
             listOfLines.add("");
-
             ImportFunctions.clone(listOfLines, "guide-getting-started", 0, GuidesCommon);
 
             StringBuilder builder = new StringBuilder();
             for (String value : listOfLines) {
                 builder.append(value);
             }
+            writeToFile(builder.toString(), "clone.md");
 
-            String text = builder.toString();
-
-            writeToFile(text, "testing-clone-method");
-
-            assertEquals("The files differ!",
-                    FileUtils.readFileToString(newGuide, "utf-8"),
-                    FileUtils.readFileToString(testingGuide, "utf-8"));
-
+            assertEquals("The expected file " + testingGuide.getAbsolutePath() + 
+            		" differ than the file " + newGuide.getAbsolutePath(),
+                    FileUtils.readFileToString(testingGuide, "utf-8"),
+                    FileUtils.readFileToString(newGuide, "utf-8"));
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/testing-file.md b/testing-file.md
index 0e323c8..cbc3090 100644
--- a/testing-file.md
+++ b/testing-file.md
@@ -1,5 +1,10 @@
-
-# **Welcome to the Getting started with Open Liberty guide!**
+---
+markdown-version: v1
+title: instructions
+branch: lab-138-instruction
+version-history-start-date: 2020-04-22 12:57:16 UTC
+---
+::page{title="Welcome to the Getting started with Open Liberty guide!"}
 
 Learn how to develop a Java application on Open Liberty with Maven and Docker.
 
@@ -11,7 +16,7 @@ The other panel displays the IDE that you will use to create files, edit the cod
 
 
 
-# **What you'll learn**
+::page{title="What you'll learn"}
 
 You will learn how to run and update a simple REST microservice on Open Liberty.
 You will use Maven throughout the guide to build and deploy the microservice as well as
@@ -25,7 +30,7 @@ It also deploys to every major cloud platform, including Docker, Kubernetes, and
 Foundry.
 
 Maven is an automation build tool that provides an efficient way to develop Java applications.
-Using Maven, you will build a simple microservice, called **system**, that collects basic
+Using Maven, you will build a simple microservice, called ***system***, that collects basic
 system properties from your laptop and displays them on an endpoint that you can access
 in your web browser. 
 
@@ -37,64 +42,60 @@ Finally, you will package the application along with the server configuration in
 image and run that image as a container.
 
 
-# **Getting started**
+::page{title="Getting started"}
 
 To open a new command-line session,
 select **Terminal** > **New Terminal** from the menu of the IDE.
 
 Run the following command to navigate to the **/home/project** directory:
 
-```
+```bash
 cd /home/project
 ```
-{: codeblock}
 
 The fastest way to work through this guide is to clone the [Git repository](https://github.com/openliberty/guide-getting-started.git) and use the projects that are provided inside:
 
-```
+```bash
 git clone https://github.com/openliberty/guide-getting-started.git
 cd guide-getting-started
 ```
-{: codeblock}
 
 
-The **start** directory contains the starting project that you will build upon.
+The ***start*** directory contains the starting project that you will build upon.
 
-The **finish** directory contains the finished project that you will build.
+The ***finish*** directory contains the finished project that you will build.
 
 
 
 
-# **Building and running the application**
+::page{title="Building and running the application"}
 
 Your application is configured to be built with Maven. Every Maven-configured project
-contains a **pom.xml** file, which defines the project configuration, dependencies, plug-ins,
+contains a ***pom.xml*** file, which defines the project configuration, dependencies, plug-ins,
 and so on.
 
-Your **pom.xml** file is located in the **start** directory and is configured to
-include the **liberty-maven-plugin**, which allows you
+Your ***pom.xml*** file is located in the ***start*** directory and is configured to
+include the ***liberty-maven-plugin***, which allows you
 to install applications into Open Liberty and manage the server instances.
 
 
-To begin, navigate to the **start** directory. Build the **system** microservice
+To begin, navigate to the ***start*** directory. Build the ***system*** microservice
 that is provided and deploy it to Open Liberty by running the Maven
-**liberty:run** goal:
+***liberty:run*** goal:
 
-```
+```bash
 cd start
 mvn liberty:run
 ```
-{: codeblock}
 
-
-The **mvn** command initiates a Maven build, during which the **target** directory is created
+The ***mvn*** command initiates a Maven build, during which the ***target*** directory is created
 to store all build-related files.
 
-The **liberty:run** argument specifies the Open Liberty **run** goal, which
+The ***liberty:run*** argument specifies the Open Liberty ***run*** goal, which
 starts an Open Liberty server instance in the foreground.
 As part of this phase, an Open Liberty server runtime is downloaded and installed into
-the **target/liberty/wlp** directory, a server instance is created and configured in the
-**target/liberty/wlp/usr/servers/defaultServer** directory, and the application is
+the ***target/liberty/wlp*** directory, a server instance is created and configured in the
+***target/liberty/wlp/usr/servers/defaultServer*** directory, and the application is
 installed into that server via [loose config](https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/rwlp_loose_applications.html).
 
 For more information about the Liberty Maven plug-in, see its [GitHub repository](https://github.com/WASdev/ci.maven).
@@ -111,16 +112,14 @@ for the following message, which indicates that the server startup is complete:
 Open another command-line session by selecting **Terminal** > **New Terminal** from the menu of the IDE.
 
 
-To access the **system** microservice, see the http://localhost:9080/system/properties URL,
+To access the ***system*** microservice, see the http://localhost:9080/system/properties URL,
 
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/system/properties | jq
 ```
-{: codeblock}
-
 
 and you see a list of the various system properties of your JVM:
 
@@ -132,48 +131,41 @@ and you see a list of the various system properties of your JVM:
 }
 ```
 
-When you need to stop the server, press **CTRL+C** in the command-line session where
-you ran the server, or run the **liberty:stop** goal from the **start** directory in
+When you need to stop the server, press ***CTRL+C*** in the command-line session where
+you ran the server, or run the ***liberty:stop*** goal from the ***start*** directory in
 another command-line session:
 
-```
+```bash
 mvn liberty:stop
 ```
-{: codeblock}
 
 
 
-
-# **Starting and stopping the Open Liberty server in the background**
+::page{title="Starting and stopping the Open Liberty server in the background"}
 
 Although you can start and stop the server in the foreground by using the Maven
-**liberty:run** goal, you can also start and stop the server in the background with
-the Maven **liberty:start** and **liberty:stop** goals:
+***liberty:run*** goal, you can also start and stop the server in the background with
+the Maven ***liberty:start*** and ***liberty:stop*** goals:
 
-```
+```bash
 mvn liberty:start
 mvn liberty:stop
 ```
-{: codeblock}
-
-
 
 
 
-# **Updating the server configuration without restarting the server**
+::page{title="Updating the server configuration without restarting the server"}
 
-The Open Liberty Maven plug-in includes a **dev** goal that listens for any changes in the project, 
+The Open Liberty Maven plug-in includes a ***dev*** goal that listens for any changes in the project, 
 including application source code or configuration. The Open Liberty server automatically reloads the configuration without restarting. This goal allows for quicker turnarounds and an improved developer experience.
 
-Stop the Open Liberty server if it is running, and start it in dev mode by running the **liberty:dev** goal in the **start** directory:
+Stop the Open Liberty server if it is running, and start it in dev mode by running the ***liberty:dev*** goal in the ***start*** directory:
 
-```
+```bash
 mvn liberty:dev
 ```
-{: codeblock}
-
 
-Dev mode automatically picks up changes that you make to your application and allows you to run tests by pressing the **enter/return** key in the active command-line session. When you’re working on your application, rather than rerunning Maven commands, press the **enter/return** key to verify your change.
+Dev mode automatically picks up changes that you make to your application and allows you to run tests by pressing the ***enter/return*** key in the active command-line session. When you’re working on your application, rather than rerunning Maven commands, press the ***enter/return*** key to verify your change.
 
 
 As before, you can see that the application is running by going to the http://localhost:9080/system/properties URL.
@@ -181,51 +173,49 @@ As before, you can see that the application is running by going to the http://lo
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/system/properties | jq
 ```
-{: codeblock}
 
 
 
 Now try updating the server configuration while the server is running in dev mode.
-The **system** microservice does not currently include health monitoring to report whether the server and the microservice that it runs are healthy.
-You can add health reports with the MicroProfile Health feature, which adds a **/health** endpoint to your application.
+The ***system*** microservice does not currently include health monitoring to report whether the server and the microservice that it runs are healthy.
+You can add health reports with the MicroProfile Health feature, which adds a ***/health*** endpoint to your application.
 
-If you try to access this endpoint now at the http://localhost:9080/health/ URL, you see a 404 error because the **/health** endpoint does not yet exist:
+If you try to access this endpoint now at the http://localhost:9080/health/ URL, you see a 404 error because the ***/health*** endpoint does not yet exist:
 
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl http://localhost:9080/health/
 ```
-{: codeblock}
-
 
 
 ```
 Error 404: java.io.FileNotFoundException: SRVE0190E: File not found: /health
 ```
 
-To add the MicroProfile Health feature to the server, include the **mpHealth** feature in the **server.xml**.
+To add the MicroProfile Health feature to the server, include the ***mpHealth*** feature in the ***server.xml***.
 
 Replace the server configuration file.
 
-> From the menu of the IDE, select
-> **File** > **Open** > guide-getting-started/start/src/main/liberty/config/server.xml
+> To open the server.xml file in your IDE, select
+> **File** > **Open** > guide-getting-started/start/src/main/liberty/config/server.xml, or click the following button
 
+::openFile{path="/home/project/guide-getting-started/start/src/main/liberty/config/server.xml"}
 
 
 
-```
+```xml
 <server description="Sample Liberty server">
     <featureManager>
         <feature>jaxrs-2.1</feature>
         <feature>jsonp-1.1</feature>
         <feature>cdi-2.0</feature>
         <feature>mpMetrics-3.0</feature>
-        <feature>mpHealth-3.0</feature>
+        <feature>mpHealth-3.1</feature>
         <feature>mpConfig-2.0</feature>
     </featureManager>
 
@@ -243,12 +233,11 @@ Replace the server configuration file.
     <variable name="io_openliberty_guides_system_inMaintenance" value="false"/>
 </server>
 ```
-{: codeblock}
 
 
 
 After you make the file changes, Open Liberty automatically reloads its configuration.
-When enabled, the **mpHealth** feature automatically adds a **/health** endpoint to the application.
+When enabled, the ***mpHealth*** feature automatically adds a ***/health*** endpoint to the application.
 You can see the server being updated in the server log displayed in your command-line session:
 
 ```
@@ -264,15 +253,14 @@ You can see the server being updated in the server log displayed in your command
 ```
 
 
-Try to access the **/health** endpoint again by visiting the http://localhost:9080/health URL.
+Try to access the ***/health*** endpoint again by visiting the http://localhost:9080/health URL.
 
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/health | jq
 ```
-{: codeblock}
 
 
 You see the following JSON:
@@ -288,36 +276,37 @@ Now you can verify whether your server is up and running.
 
 
 
-# **Updating the source code without restarting the server**
+::page{title="Updating the source code without restarting the server"}
 
-The JAX-RS application that contains your **system** microservice runs in a server from its **.class** file and other artifacts.
+The JAX-RS application that contains your ***system*** microservice runs in a server from its ***.class*** file and other artifacts.
 Open Liberty automatically monitors these artifacts, and whenever they are updated, it updates the running server without the need for the server to be restarted.
 
-Look at your **pom.xml** file.
+Look at your ***pom.xml*** file.
 
 
 Try updating the source code while the server is running in dev mode.
-At the moment, the **/health** endpoint reports whether the server is running, but the endpoint doesn't provide any details on the microservices that are running inside of the server.
+At the moment, the ***/health*** endpoint reports whether the server is running, but the endpoint doesn't provide any details on the microservices that are running inside of the server.
 
 MicroProfile Health offers health checks for both readiness and liveness.
 A readiness check allows third-party services, such as Kubernetes, to know if the microservice is ready to process requests.
 A liveness check allows third-party services to determine if the microservice is running.
 
-Create the **SystemReadinessCheck** class.
+Create the ***SystemReadinessCheck*** class.
 
 > Run the following touch command in your terminal
-```
+```bash
 touch /home/project/guide-getting-started/start/src/main/java/io/openliberty/sample/system/SystemReadinessCheck.java
 ```
-{: codeblock}
 
 
-> Then from the menu of the IDE, select **File** > **Open** > guide-getting-started/start/src/main/java/io/openliberty/sample/system/SystemReadinessCheck.java
+> Then, to open the SystemReadinessCheck.java file in your IDE, select
+> **File** > **Open** > guide-getting-started/start/src/main/java/io/openliberty/sample/system/SystemReadinessCheck.java, or click the following button
 
+::openFile{path="/home/project/guide-getting-started/start/src/main/java/io/openliberty/sample/system/SystemReadinessCheck.java"}
 
 
 
-```
+```java
 package io.openliberty.sample.system;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -351,28 +340,28 @@ public class SystemReadinessCheck implements HealthCheck {
 
 }
 ```
-{: codeblock}
 
 
 
-The **SystemReadinessCheck** class verifies that the 
-**system** microservice is not in maintenance by checking a config property.
+The ***SystemReadinessCheck*** class verifies that the 
+***system*** microservice is not in maintenance by checking a config property.
 
-Create the **SystemLivenessCheck** class.
+Create the ***SystemLivenessCheck*** class.
 
 > Run the following touch command in your terminal
-```
+```bash
 touch /home/project/guide-getting-started/start/src/main/java/io/openliberty/sample/system/SystemLivenessCheck.java
 ```
-{: codeblock}
 
 
-> Then from the menu of the IDE, select **File** > **Open** > guide-getting-started/start/src/main/java/io/openliberty/sample/system/SystemLivenessCheck.java
+> Then, to open the SystemLivenessCheck.java file in your IDE, select
+> **File** > **Open** > guide-getting-started/start/src/main/java/io/openliberty/sample/system/SystemLivenessCheck.java, or click the following button
 
+::openFile{path="/home/project/guide-getting-started/start/src/main/java/io/openliberty/sample/system/SystemLivenessCheck.java"}
 
 
 
-```
+```java
 package io.openliberty.sample.system;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -396,21 +385,18 @@ public class SystemLivenessCheck implements HealthCheck {
 
         return HealthCheckResponse.named(
             SystemResource.class.getSimpleName() + " Liveness Check")
-                                  .withData("memory used", memUsed)
-                                  .withData("memory max", memMax)
                                   .status(memUsed < memMax * 0.9).build();
     }
 
 }
 ```
-{: codeblock}
 
 
 
-The **SystemLivenessCheck** class reports a status of 
-**DOWN** if the microservice uses over 90% of the maximum amount of memory.
+The ***SystemLivenessCheck*** class reports a status of 
+***DOWN*** if the microservice uses over 90% of the maximum amount of memory.
 
-After you make the file changes, Open Liberty automatically reloads its configuration and the **system** application.
+After you make the file changes, Open Liberty automatically reloads its configuration and the ***system*** application.
 
 The following messages display in your first command-line session:
 
@@ -422,18 +408,17 @@ The following messages display in your first command-line session:
 ```
 
 
-Access the **/health** endpoint again by going to the http://localhost:9080/health URL.
+Access the ***/health*** endpoint again by going to the http://localhost:9080/health URL.
 
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/health | jq
 ```
-{: codeblock}
 
 
-This time you see the overall status of your server and the aggregated data of the liveness and readiness checks for the **system** microservice:
+This time you see the overall status of your server and the aggregated data of the liveness and readiness checks for the ***system*** microservice:
 
 ```
 {  
@@ -444,10 +429,7 @@ This time you see the overall status of your server and the aggregated data of t
          "status":"UP"
       },
       {  
-         "data":{
-            "memory used":40434888,
-            "memory max":4294967296
-         },
+         "data":{},
          "name":"SystemResource Liveness Check",
          "status":"UP"
       }
@@ -457,76 +439,75 @@ This time you see the overall status of your server and the aggregated data of t
 ```
 
 
-You can also access the **/health/ready** endpoint by going to the http://localhost:9080/health/ready URL to view the data from the readiness health check.
+You can also access the ***/health/ready*** endpoint by going to the http://localhost:9080/health/ready URL to view the data from the readiness health check.
 
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/health/ready | jq
 ```
-{: codeblock}
 
 
 
-Similarly, access the **/health/live** endpoint by going to the http://localhost:9080/health/live URL to view the data from the liveness health check.
+Similarly, access the ***/health/live*** endpoint by going to the http://localhost:9080/health/live URL to view the data from the liveness health check.
 
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/health/live | jq
 ```
-{: codeblock}
 
 
 
 Making code changes and recompiling is fast and straightforward.
-Open Liberty dev mode automatically picks up changes in the **.class** files and artifacts, without needing to be restarted.
-Alternatively, you can run the **run** goal and manually repackage or recompile the application by using the **mvn package** command or the **mvn compile** command while the server is running. Dev mode was added to further improve the developer experience by minimizing turnaround times.
+Open Liberty dev mode automatically picks up changes in the ***.class*** files and artifacts, without needing to be restarted.
+Alternatively, you can run the ***run*** goal and manually repackage or recompile the application by using the ***mvn package*** command or the ***mvn compile*** command while the server is running. Dev mode was added to further improve the developer experience by minimizing turnaround times.
 
 
 
-# **Checking the Open Liberty server logs**
+::page{title="Checking the Open Liberty server logs"}
 
 While the server is running in the foreground, it displays various console messages in
-the command-line session. These messages are also logged to the **target/liberty/wlp/usr/servers/defaultServer/logs/console.log**
-file. You can find the complete server logs in the **target/liberty/wlp/usr/servers/defaultServer/logs**
-directory. The **console.log** and **messages.log** files are the primary log files that contain
+the command-line session. These messages are also logged to the ***target/liberty/wlp/usr/servers/defaultServer/logs/console.log***
+file. You can find the complete server logs in the ***target/liberty/wlp/usr/servers/defaultServer/logs***
+directory. The ***console.log*** and ***messages.log*** files are the primary log files that contain
 console output of the running application and the server. More logs are created when runtime errors 
 occur or whenever tracing is enabled. You can find the error logs in the
-**ffdc** directory and the tracing logs in the **trace.log** file.
+***ffdc*** directory and the tracing logs in the ***trace.log*** file.
 
 In addition to the log files that are generated automatically, you can enable logging of
-specific Java packages or classes by using the **logging** element:
+specific Java packages or classes by using the ***logging*** element:
 
 ```
 <logging traceSpecification="<component_1>=<level>:<component_2>=<level>:..."/>
 ```
 
-The **component** element is a Java package or class, and the **level** element is one
-of the following logging levels: **off**, **fatal**, **severe**, **warning**, **audit**, **info**,
-**config**, **detail**, **fine**, **finer**, **finest**, **all**.
+The ***component*** element is a Java package or class, and the ***level*** element is one
+of the following logging levels: ***off***, ***fatal***, ***severe***, ***warning***, ***audit***, ***info***,
+***config***, ***detail***, ***fine***, ***finer***, ***finest***, ***all***.
 
 Try enabling detailed logging of the MicroProfile Health feature by adding the
-**logging** element to your configuration file.
+***logging*** element to your configuration file.
 
 Replace the server configuration file.
 
-> From the menu of the IDE, select
-> **File** > **Open** > guide-getting-started/start/src/main/liberty/config/server.xml
+> To open the server.xml file in your IDE, select
+> **File** > **Open** > guide-getting-started/start/src/main/liberty/config/server.xml, or click the following button
 
+::openFile{path="/home/project/guide-getting-started/start/src/main/liberty/config/server.xml"}
 
 
 
-```
+```xml
 <server description="Sample Liberty server">
     <featureManager>
         <feature>jaxrs-2.1</feature>
         <feature>jsonp-1.1</feature>
         <feature>cdi-2.0</feature>
         <feature>mpMetrics-3.0</feature>
-        <feature>mpHealth-3.0</feature>
+        <feature>mpHealth-3.1</feature>
         <feature>mpConfig-2.0</feature>
     </featureManager>
 
@@ -545,64 +526,54 @@ Replace the server configuration file.
     <variable name="io_openliberty_guides_system_inMaintenance" value="false"/>
 </server>
 ```
-{: codeblock}
 
 
 
 After you change the file, Open Liberty automatically reloads its configuration.
 
-Now, when you visit the **/health** endpoint, additional traces are logged in the **trace.log** file.
+Now, when you visit the ***/health*** endpoint, additional traces are logged in the ***trace.log*** file.
 
-When you are done checking out the service, exit dev mode by pressing **CTRL+C** in the command-line session
-where you ran the server, or by typing **q** and then pressing the **enter/return** key.
+When you are done checking out the service, exit dev mode by pressing ***CTRL+C*** in the command-line session where you ran the server, or by typing ***q*** and then pressing the ***enter/return*** key.
 
 
-# **Running the application in a Docker container**
+::page{title="Running the application in a Docker container"}
 
 To run the application in a container, Docker needs to be installed. For installation
 instructions, see the [Official Docker Docs](https://docs.docker.com/install/).
 
 Make sure to start your Docker daemon before you proceed.
 
-To containerize the application, you need a **Dockerfile**. This file contains a collection
+To containerize the application, you need a ***Dockerfile***. This file contains a collection
 of instructions that define how a Docker image is built, what files are packaged into it,
 what commands run when the image runs as a container, and other information. You can find a complete
-**Dockerfile** in the **start** directory. This **Dockerfile** copies the **.war** file into a Docker
+***Dockerfile*** in the ***start*** directory. This ***Dockerfile*** copies the ***.war*** file into a Docker
 image that contains the Java runtime and a preconfigured Open Liberty server.
 
-Run the **mvn package** command from the **start** directory so that the **.war** file resides in the **target** directory.
+Run the ***mvn package*** command from the ***start*** directory so that the ***.war*** file resides in the ***target*** directory.
 
-```
+```bash
 mvn package
 ```
-{: codeblock}
-
 
 Run the following command to download or update to the latest Open Liberty Docker image:
 
+```bash
+docker pull icr.io/appcafe/open-liberty:full-java11-openj9-ubi
 ```
-docker pull openliberty/open-liberty:full-java11-openj9-ubi
-```
-{: codeblock}
-
 
 To build and containerize the application, run the
-following Docker build command in the **start** directory:
+following Docker build command in the ***start*** directory:
 
-```
+```bash
 docker build -t openliberty-getting-started:1.0-SNAPSHOT .
 ```
-{: codeblock}
 
+The Docker ***openliberty-getting-started:1.0-SNAPSHOT*** image is also built from the ***Dockerfile***.
+To verify that the image is built, run the ***docker images*** command to list all local Docker images:
 
-The Docker **openliberty-getting-started:1.0-SNAPSHOT** image is also built from the **Dockerfile**.
-To verify that the image is built, run the **docker images** command to list all local Docker images:
-
-```
+```bash
 docker images
 ```
-{: codeblock}
-
 
 Your image should appear in the list of all Docker images:
 
@@ -612,11 +583,9 @@ openliberty-getting-started    1.0-SNAPSHOT    85085141269b    21 hours ago    4
 ```
 
 Next, run the image as a container:
-```
+```bash
 docker run -d --name gettingstarted-app -p 9080:9080 openliberty-getting-started:1.0-SNAPSHOT
 ```
-{: codeblock}
-
 
 There is a bit going on here, so here's a breakdown of the command:
 
@@ -626,16 +595,14 @@ There is a bit going on here, so here's a breakdown of the command:
 | --name | Specifies a name for the container.
 | -p     | Maps the container ports to the host ports.
 
-The final argument in the **docker run** command is the Docker image name.
+The final argument in the ***docker run*** command is the Docker image name.
 
-Next, run the **docker ps** command to verify that your container started:
-```
+Next, run the ***docker ps*** command to verify that your container started:
+```bash
 docker ps
 ```
-{: codeblock}
 
-
-Make sure that your container is running and does not have **Exited** as its status:
+Make sure that your container is running and does not have ***Exited*** as its status:
 
 ```
 CONTAINER ID    IMAGE                         CREATED          STATUS           NAMES
@@ -648,44 +615,38 @@ To access the application, go to the http://localhost:9080/system/properties URL
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/system/properties | jq
 ```
-{: codeblock}
 
 
 
 To stop and remove the container, run the following commands:
-```
+```bash
 docker stop gettingstarted-app && docker rm gettingstarted-app
 ```
-{: codeblock}
-
 
 To remove the image, run the following command:
-```
+```bash
 docker rmi openliberty-getting-started:1.0-SNAPSHOT
 ```
-{: codeblock}
 
 
+::page{title="Developing the application in a Docker container"}
 
-# **Developing the application in a Docker container**
-
-The Open Liberty Maven plug-in includes a **devc** goal that simplifies developing
+The Open Liberty Maven plug-in includes a ***devc*** goal that simplifies developing
 your application in a Docker container by starting dev mode with container
 support. This goal builds a Docker image, mounts the required directories, binds
 the required ports, and then runs the application inside of a container. Dev
 mode also listens for any changes in the application source code or
 configuration and rebuilds the image and restarts the container as necessary.
 
-Build and run the container by running the devc goal from the **start** directory:
+Build and run the container by running the devc goal from the ***start*** directory:
 
 
 ```
 mvn liberty:devc -DserverStartTimeout=300
 ```
-{: codeblock}
 
 When you see the following message, Open Liberty is ready to run in dev mode:
 
@@ -694,14 +655,12 @@ When you see the following message, Open Liberty is ready to run in dev mode:
 *    Liberty is running in dev mode.
 ```
 
-Open another command-line session and run the **docker ps** command to verify that your container started:
-```
+Open another command-line session and run the ***docker ps*** command to verify that your container started:
+```bash
 docker ps
 ```
-{: codeblock}
 
-
-Your container should be running and have **Up** as its status:
+Your container should be running and have ***Up*** as its status:
 
 ```
 CONTAINER ID        IMAGE                                 COMMAND                  CREATED             STATUS                         PORTS                                                                    NAMES
@@ -714,35 +673,35 @@ To access the application, go to the http://localhost:9080/system/properties URL
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/system/properties | jq
 ```
-{: codeblock}
 
 
 
 Dev mode automatically picks up changes that you make to your
-application and allows you to run tests by pressing the **enter/return** key in the
+application and allows you to run tests by pressing the ***enter/return*** key in the
 active command-line session.
 
-Update the **server.xml** file to change the context root from **/** to **/dev**.
+Update the ***server.xml*** file to change the context root from ***/*** to ***/dev***.
 
 Replace the server configuration file.
 
-> From the menu of the IDE, select
-> **File** > **Open** > guide-getting-started/start/src/main/liberty/config/server.xml
+> To open the server.xml file in your IDE, select
+> **File** > **Open** > guide-getting-started/start/src/main/liberty/config/server.xml, or click the following button
 
+::openFile{path="/home/project/guide-getting-started/start/src/main/liberty/config/server.xml"}
 
 
 
-```
+```xml
 <server description="Sample Liberty server">
     <featureManager>
         <feature>jaxrs-2.1</feature>
         <feature>jsonp-1.1</feature>
         <feature>cdi-2.0</feature>
         <feature>mpMetrics-3.0</feature>
-        <feature>mpHealth-3.0</feature>
+        <feature>mpHealth-3.1</feature>
         <feature>mpConfig-2.0</feature>
     </featureManager>
 
@@ -760,11 +719,10 @@ Replace the server configuration file.
     <variable name="io_openliberty_guides_system_inMaintenance" value="false"/>
 </server>
 ```
-{: codeblock}
 
 
 
-Update the **mpData.js** file to change the **url** in the **getSystemPropertiesRequest** method to reflect the new context root.
+Update the ***mpData.js*** file to change the ***url*** in the ***getSystemPropertiesRequest*** method to reflect the new context root.
 
 
 Update the mpData.js file.
@@ -789,58 +747,52 @@ http://localhost:9080/dev/system/properties
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/dev/system/properties | jq
 ```
-{: codeblock}
-
 
-URL. Notice that context root is now **/dev**.
+URL. Notice that context root is now ***/dev***.
 
-When you are finished, exit dev mode by pressing **CTRL+C** in the
+When you are finished, exit dev mode by pressing ***CTRL+C*** in the
 command-line session that the container was started from, or by typing `q` and
-then pressing the **enter/return** key. Either of these options stops and 
-removes the container. To check that the container was stopped, run the **docker ps** command.
+then pressing the ***enter/return*** key. Either of these options stops and 
+removes the container. To check that the container was stopped, run the ***docker ps*** command.
 
 
-# **Running the application from a minimal runnable JAR**
+::page{title="Running the application from a minimal runnable JAR"}
 
-So far, Open Liberty was running out of the **target/liberty/wlp** directory, which
+So far, Open Liberty was running out of the ***target/liberty/wlp*** directory, which
 effectively contains an Open Liberty server installation and the deployed application. The
 final product of the Maven build is a server package for use in a continuous integration
 pipeline and, ultimately, a production deployment.
 
 Open Liberty supports a number of different server packages. The sample application
-currently generates a **usr** package that contains the servers and application to be
+currently generates a ***usr*** package that contains the servers and application to be
 extracted onto an Open Liberty installation.
 
 Instead of creating a server package, you can generate a runnable JAR file that contains
 the application along with a server runtime. This JAR file can then be run anywhere and deploy
 your application and server at the same time. To generate a runnable JAR file, override the 
-**include** property: 
-```
+***include*** property: 
+```bash
 mvn liberty:package -Dinclude=runnable
 ```
-{: codeblock}
-
 
-The packaging type is overridden from the **usr** package to the **runnable**
-package. This property then propagates to the **liberty-maven-plugin**
-plug-in, which generates the server package based on the **openliberty-kernel** package.
+The packaging type is overridden from the ***usr*** package to the ***runnable***
+package. This property then propagates to the ***liberty-maven-plugin***
+plug-in, which generates the server package based on the ***openliberty-kernel*** package.
 
-When the build completes, you can find the minimal runnable **guide-getting-started.jar** file in the
-**target** directory. This JAR file contains only the **features** that you
-explicitly enabled in your **server.xml** file. As a result, the
+When the build completes, you can find the minimal runnable ***guide-getting-started.jar*** file in the
+***target*** directory. This JAR file contains only the ***features*** that you
+explicitly enabled in your ***server.xml*** file. As a result, the
 generated JAR file is only about 50 MB.
 
-To run the JAR file, first stop the server if it's running. Then, navigate to the **target**
-directory and run the **java -jar** command:
+To run the JAR file, first stop the server if it's running. Then, navigate to the ***target***
+directory and run the ***java -jar*** command:
 
-```
+```bash
 java -jar guide-getting-started.jar
 ```
-{: codeblock}
-
 
 
 When the server starts, go to the http://localhost:9080/dev/system/properties URL to access
@@ -848,45 +800,40 @@ When the server starts, go to the http://localhost:9080/dev/system/properties UR
 
 _To see the output for this URL in the IDE, run the following command at a terminal:_
 
-```
+```bash
 curl -s http://localhost:9080/dev/system/properties | jq
 ```
-{: codeblock}
-
 
 your application that is now running out of the minimal runnable JAR file.
 
-You can stop the server by pressing **CTRL+C** in the command-line session that the server runs in.
+You can stop the server by pressing ***CTRL+C*** in the command-line session that the server runs in.
 
 
 
 
 
-# **Summary**
+::page{title="Summary"}
 
-## **Nice Work!**
+### Nice Work!
 
 You've learned the basics of deploying and updating an application on an Open Liberty server.
 
 
 
 
-<br/>
-## **Clean up your environment**
+### Clean up your environment
 
 
 Clean up your online environment so that it is ready to be used with the next guide:
 
-Delete the **guide-getting-started** project by running the following commands:
+Delete the ***guide-getting-started*** project by running the following commands:
 
-```
+```bash
 cd /home/project
 rm -fr guide-getting-started
 ```
-{: codeblock}
 
-<br/>
-## **What did you think of this guide?**
+### What did you think of this guide?
 
 We want to hear from you. To provide feedback, click the following link.
 
@@ -894,8 +841,7 @@ We want to hear from you. To provide feedback, click the following link.
 
 Or, click the **Support/Feedback** button in the IDE and select the **Give feedback** option. Fill in the fields, choose the **General** category, and click the **Post Idea** button.
 
-<br/>
-## **What could make this guide better?**
+### What could make this guide better?
 
 You can also provide feedback or contribute to this guide from GitHub.
 * [Raise an issue to share feedback.](https://github.com/OpenLiberty/guide-getting-started/issues)
@@ -903,15 +849,13 @@ You can also provide feedback or contribute to this guide from GitHub.
 
 
 
-<br/>
-## **Where to next?**
+### Where to next?
 
 * [Building a web application with Maven](https://openliberty.io/guides/maven-intro.html)
 * [Creating a RESTful web service](https://openliberty.io/guides/rest-intro.html)
 * [Using Docker containers to develop microservices](https://openliberty.io/guides/docker.html)
 
 
-<br/>
-## **Log out of the session**
+### Log out of the session
 
 Log out of the cloud-hosted guides by selecting **Account** > **Logout** from the Skills Network menu.
diff --git a/version-history-start-date.properties b/version-history-start-date.properties
new file mode 100644
index 0000000..a1457c8
--- /dev/null
+++ b/version-history-start-date.properties
@@ -0,0 +1,62 @@
+cloud-hosted-draft-guide-devlab-1.start-date=2022-02-09T14:19:17.000Z
+cloud-hosted-draft-guide-devlab-1.branch=lab-204-instruction
+cloud-hosted-draft-guide-devlab-2.start-date=2022-02-11T18:24:15Z
+cloud-hosted-draft-guide-devlab-2.branch=lab-207-instruction
+cloud-hosted-guide-arquillian-managed.start-date=2021-11-25 22:27:51 UTC
+cloud-hosted-guide-arquillian-managed.branch=lab-103-instruction
+cloud-hosted-guide-bean-validation.start-date=2021-11-26 20:42:26 UTC
+cloud-hosted-guide-bean-validation.branch=lab-105-instruction
+cloud-hosted-guide-cdi-intro.start-date=2022-03-22T21:26:09Z
+cloud-hosted-guide-cdi-intro.branch=lab-371-instruction
+cloud-hosted-guide-containerize.start-date=2021-04-16 14:06:18 UTC
+cloud-hosted-guide-containerize.branch=lab-155-instruction
+cloud-hosted-guide-contract-testing.start-date=2021-03-04 19:50:13 UTC
+cloud-hosted-guide-contract-testing.branch=lab-154-instruction
+cloud-hosted-guide-cors.start-date=2021-12-02 17:13:42 UTC
+cloud-hosted-guide-cors.branch=lab-102-instruction
+cloud-hosted-guide-docker.start-date=2020-06-11 12:03:57 UTC
+cloud-hosted-guide-docker.branch=lab-169-instruction
+cloud-hosted-guide-getting-started.start-date=2020-04-22 12:57:16 UTC
+cloud-hosted-guide-getting-started.branch=lab-138-instruction
+cloud-hosted-guide-jpa-intro.start-date=2021-12-02 17:23:03 UTC
+cloud-hosted-guide-jpa-intro.branch=lab-101-instruction
+cloud-hosted-guide-kubernetes-intro.start-date=2020-04-22 13:19:07 UTC
+cloud-hosted-guide-kubernetes-intro.branch=lab-137-instruction
+cloud-hosted-guide-kubernetes-microprofile-config.start-date=2021-08-23 16:28:42 UTC
+cloud-hosted-guide-kubernetes-microprofile-config.branch=lab-143-instruction
+cloud-hosted-guide-kubernetes-microprofile-health.start-date=2021-08-19 19:37:00 UTC
+cloud-hosted-guide-kubernetes-microprofile-health.branch=lab-144-instruction
+cloud-hosted-guide-maven-intro.start-date=2021-12-03 21:25:57 UTC
+cloud-hosted-guide-maven-intro.branch=lab-91-instruction
+cloud-hosted-guide-maven-multimodules.start-date=2021-12-03 21:25:57 UTC
+cloud-hosted-guide-maven-multimodules.branch=lab-70-instruction
+cloud-hosted-guide-microprofile-config.start-date=2020-06-11 12:06:15 UTC
+cloud-hosted-guide-microprofile-config.branch=lab-166-instruction
+cloud-hosted-guide-microprofile-fallback.start-date=2020-05-26 16:16:02 UTC
+cloud-hosted-guide-microprofile-fallback.branch=lab-140-instruction
+cloud-hosted-guide-microprofile-health.start-date=2020-06-11 12:05:38 UTC
+cloud-hosted-guide-microprofile-health.branch=lab-168-instruction
+cloud-hosted-guide-microprofile-jwt.start-date=2020-06-11 12:10:36 UTC
+cloud-hosted-guide-microprofile-jwt.branch=lab-165-instruction
+cloud-hosted-guide-microprofile-metrics.start-date=2021-03-03 17:52:50 UTC
+cloud-hosted-guide-microprofile-metrics.branch=lab-152-instruction
+cloud-hosted-guide-microprofile-openapi.start-date=2021-03-03 17:52:52 UTC
+cloud-hosted-guide-microprofile-openapi.branch=lab-150-instruction
+cloud-hosted-guide-microprofile-opentracing-jaeger.start-date=2021-04-16 13:57:46 UTC
+cloud-hosted-guide-microprofile-opentracing-jaeger.branch=lab-153-instruction
+cloud-hosted-guide-microprofile-rest-client.start-date=2020-05-26 12:06:13 UTC
+cloud-hosted-guide-microprofile-rest-client.branch=lab-139-instruction
+cloud-hosted-guide-openliberty-operator-intro.start-date=2021-11-15 16:47:13 UTC
+cloud-hosted-guide-openliberty-operator-intro.branch=lab-85-instruction
+cloud-hosted-guide-rest-client-angular.start-date=2021-12-03 21:38:04 UTC
+cloud-hosted-guide-rest-client-angular.branch=lab-90-instruction
+cloud-hosted-guide-rest-client-angularjs.start-date=2021-12-03 21:54:52 UTC
+cloud-hosted-guide-rest-client-angularjs.branch=lab-89-instruction
+cloud-hosted-guide-rest-client-java.start-date=2021-03-04 19:50:19 UTC
+cloud-hosted-guide-rest-client-java.branch=lab-149-instruction
+cloud-hosted-guide-rest-client-reactjs.start-date=2021-12-03 21:48:34 UTC
+cloud-hosted-guide-rest-client-reactjs.branch=lab-88-instruction
+cloud-hosted-guide-rest-hateoas.start-date=2021-12-03 21:43:01 UTC
+cloud-hosted-guide-rest-hateoas.branch=lab-86-instruction
+cloud-hosted-guide-rest-intro.start-date=2020-04-22 13:17:27 UTC
+cloud-hosted-guide-rest-intro.branch=lab-141-instruction