diff --git a/building-blocks/tasks/adb/create-graph-pgql.md b/building-blocks/tasks/adb/create-graph-pgql.md
new file mode 100644
index 00000000..14abf9ae
--- /dev/null
+++ b/building-blocks/tasks/adb/create-graph-pgql.md
@@ -0,0 +1,83 @@
+<!--
+    {
+        "name":"Create Graph",
+        "description":"Create a bipartite Graph for MOVIESTREAM watched movies."
+    }
+-->
+1. Click the **Graph** icon to navigate to create your graph. Then click **Create Graph**.
+    
+    ![Shows where the create button modeler is.](images/graph/graph-create-button.png " ")
+
+2. Enter **`MOVIE_RECOMMENDATIONS`** as the graph name. That graph name is used throughout the next lab. Do not enter a different name because then the queries and code snippets in the next lab will fail.
+
+    ![Shows the create graph window where you assign the graph a name.](./images/graph/create-graph-dialog.png " ")
+
+    Click **Next**.
+
+3. Change Graph Type to PGQL Property Graph
+
+    ![Change graph type to PGQL Property Graph](./images/graph/change-graph-type.png " ")
+
+4. Expand **MOVIESTREAM** and select the `CUSTOMER_SAMPLE`, `WATCHED` and `MOVIE` tables.
+
+    ![Shows how to select tables](./images/graph/selected-tables-pgql.png " ")
+
+    Shuttle them to the right using the first icon on the shuttle control.
+
+    ![Shows the selected tables.](./images/graph/select-tables-pgql.png " ")
+
+    Click **Next**.  
+
+4. The suggested model has the `MOVIE` and `CUSTOMER_SAMPLE`, as a vertex tables since there are foreign key constraints specified on table `WATCHED` that reference them.
+
+    ![Shows the vertex and edge table.](./images/graph/create-graph-suggested-model.png " ")
+
+5. You can view and change properties of the graph by clicking on the pencil icon to the right of one of the tables. For example, click `WATCHED` and notice the edge label. You will see this label when viewing and querying the graph. Keep the `WATCHED` label because it will be used in the next lab when querying the graph.
+
+    ![Changed the label name of the edge to Transfers.](images/graph/edit-edge-label.png " ")
+
+    Click **Next**.
+
+6. You may receive a message saying "Errors and warnings for SQL Property Graph. Click **Fix all** to fix the issues Graph Studio detected.
+
+    ![Graph window indicating potential issues](images/graph/warning-window-pgql.png " ")
+
+<!---
+  **An alternate approach:** In the earlier Step 5 you could have just updated the CREATE PROPERTY GRAPH statement and saved the updates. That is, you could have just replaced the existing statement with the following one which specifies that the SOURCE KEY is  `from_acct_id`  and the DESTINATION KEY is `to_acct_id`.  
+
+    ```
+    -- This is not required if you used swap edge in UI to fix the edge direction.
+    -- This is only to illustrate an alternate approach.
+    <copy>
+    CREATE PROPERTY GRAPH bank_graph
+        VERTEX TABLES (
+            BANK_ACCOUNTS as ACCOUNTS
+            KEY (ACCT_ID)
+            LABEL ACCOUNTS
+            PROPERTIES (ACCT_ID, NAME)
+        )
+        EDGE TABLES (
+            BANK_TXNS
+            KEY (FROM_ACCT_ID, TO_ACCT_ID, AMOUNT)
+            SOURCE KEY (FROM_ACCT_ID) REFERENCES ACCOUNTS
+            DESTINATION KEY (TO_ACCT_ID) REFERENCES ACCOUNTS
+            LABEL TRANSFERS
+            PROPERTIES (AMOUNT, DESCRIPTION)
+        )
+    </copy>
+    ```
+
+   ![ALT text is not available for this image](images/graph/correct-ddl-save.png " " )  
+
+   **Important:** Click the **Save** (floppy disk icon) to commit the changes.
+--->
+
+7. In the Summary step, click on **Create Graph**
+
+    ![Shows the job tab with the job status as successful](./images/graph/jobs-create-graph.png " ")  
+
+    This will open a Create Graph tab. Click **Create Graph**.
+
+    ![Shows in-memory enabled and the create graph button](./images/graph/create-graph-in-memory.png " ")
+
+    Monitor the graph creation process. After a couple of minutes, you should see a successful **Completed** status and you'll be ready to start analyzing the graph!
diff --git a/building-blocks/tasks/adb/create-graph.md b/building-blocks/tasks/adb/create-graph.md
index e83a587a..671d2b1d 100644
--- a/building-blocks/tasks/adb/create-graph.md
+++ b/building-blocks/tasks/adb/create-graph.md
@@ -4,40 +4,39 @@
         "description":"Create a bipartite Graph for MOVIESTREAM watched movies."
     }
 -->
-
-
-1. Click the **Graph** icon to navigate to create your graph. Then click **Create Graph**.  
+1. Click the **Graph** icon to navigate to create your graph. Then click **Create Graph**.
     
-    ![Shows where the create button modeler is.](images/graph/graph-create-button.png " ")  
+    ![Shows where the create button modeler is.](images/graph/graph-create-button.png " ")
 
-2. Enter **`MOVIE_RECOMMENDATIONS`** as the graph name. That graph name is used throughout the next lab. Do not enter a different name because then the queries and code snippets in the next lab will fail. 
+2. Enter **`MOVIE_RECOMMENDATIONS`** as the graph name. That graph name is used throughout the next lab. Do not enter a different name because then the queries and code snippets in the next lab will fail.
 
     ![Shows the create graph window where you assign the graph a name.](./images/graph/create-graph-dialog.png " ")
 
-    Click **Next**.  
+    Click **Next**.
 
 3. Expand **MOVIESTREAM** and select the `CUSTOMER_SAMPLE`, `WATCHED` and `MOVIE` tables.
 
     ![Shows how to select tables](./images/graph/selected-tables.png " ")
 
-    Shuttle them to the right using the first icon on the shuttle control.   
+    Shuttle them to the right using the first icon on the shuttle control.
 
     ![Shows the selected tables.](./images/graph/select-tables.png " ")
 
     Click **Next**.  
 
-4.  The suggested model has the `MOVIE` and `CUSTOMER_SAMPLE`, as a vertex tables since there are foreign key constraints specified on table `WATCHED` that reference them.   
+4. The suggested model has the `MOVIE` and `CUSTOMER_SAMPLE`, as a vertex tables since there are foreign key constraints specified on table `WATCHED` that reference them.
 
+    ![Shows the vertex and edge table.](./images/graph/create-graph-suggested-model.png " ")
 
-    ![Shows the vertex and edge table.](./images/graph/create-graph-suggested-model.png " ")    
+5. You can view and change properties of the graph by clicking on the pencil icon to the right of one of the tables. For example, click `WATCHED` and notice the edge label. You will see this label when viewing and querying the graph. Keep the `WATCHED` label because it will be used in the next lab when querying the graph.
 
+    ![Changed the label name of the edge to Transfers.](images/graph/edit-edge-label.png " ")
 
-5.  You can view and change properties of the graph by clicking on one of the tables. For example, click `WATCHED` and notice the edge label. You will see this label when viewing and querying the graph. Keep the `WATCHED` label because it will be used in the next lab when querying the graph.  
+    Click **Next**.
 
-    ![Changed the label name of the edge to Transfers.](images/graph/edit-edge-label.png " ")  
+6. You may receive a message saying "Errors and warnings for SQL Property Graph. Click **Fix all** to fix the issues Graph Studio detected.
 
-    Click **Next**.        
- 
+    ![Graph window indicating potential issues](images/graph/warning-window.png " ")
 
 <!---
   **An alternate approach:** In the earlier Step 5 you could have just updated the CREATE PROPERTY GRAPH statement and saved the updates. That is, you could have just replaced the existing statement with the following one which specifies that the SOURCE KEY is  `from_acct_id`  and the DESTINATION KEY is `to_acct_id`.  
@@ -69,11 +68,11 @@
    **Important:** Click the **Save** (floppy disk icon) to commit the changes.
 --->
 
-6. In the Summary step, click on **Create Graph**:
+7. In the Summary step, click on **Create Graph**
 
     ![Shows the job tab with the job status as successful](./images/graph/jobs-create-graph.png " ")  
 
-    This will open a Create Graph tab. Click **Create Graph**. 
+    This will open a Create Graph tab. Click **Create Graph**.
 
     ![Shows in-memory enabled and the create graph button](./images/graph/create-graph-in-memory.png " ")
 
diff --git a/building-blocks/tasks/adb/goto-graph-studio.md b/building-blocks/tasks/adb/goto-graph-studio.md
index 84ff66dc..afc35c4e 100644
--- a/building-blocks/tasks/adb/goto-graph-studio.md
+++ b/building-blocks/tasks/adb/goto-graph-studio.md
@@ -1,17 +1,16 @@
 <!--
     {
         "name":"Go to Graph Studio",
-        "description":"Login to Graph Studio from the Autonomous Database OCI console"
+        "description":"Login to Graph Studio from the Autonomous AI Database OCI console"
     }
 -->
+Graph Studio is a feature of Autonomous AI Database. It is available as an option on the Database Actions Launchpad. You need a graph-enabled user to log into Graph Studio. In this workshop, the graph user has already been created for you.
 
-Graph Studio is a feature of Autonomous Database. It is available as an option on the Database Actions Launchpad. You need a graph-enabled user to log into Graph Studio. In this workshop, the graph user has already been created for you.
+1. In your **Autonomous AI Database Details page** page, click the **Database Actions** button, and then select **View all database actions**.
 
-1. In your **Autonomous Database Details page** page, click the **Database Actions** button, and then select **View all database actions**.
+    ![Click the Database Actions button.](images/adb-dbactions-goto.png " ")
 
-    ![Click the Database Actions button.](images/adb-dbactions-goto.png " ") 
-
-    >**Note:** Use the Admin credentials to sign in if needed. (The Admin user password is located under **View Login Info** )   
+    >**Note:** Use the Admin credentials to sign in if needed. (The Admin user password is located under **View Login Info** )
 
 2. On the Database Actions panel, click **Graph Studio**.
 
@@ -19,9 +18,9 @@ Graph Studio is a feature of Autonomous Database. It is available as an option o
 
 3. Log in to Graph Studio. Use the credentials for the graph user:
 
-    The graph user credentials are: 
+    The graph user credentials are:
 
-    **Username:** [](var:db_user_name)    
+    **Username:** [](var:db_user_name)
     **Password:** *your-password* (e.g. watchS0meMovies#)
 
-    ![Use the credentials for database user MOVIESTREAM.](images/graph/graph-login.png " ")
\ No newline at end of file
+    ![Use the credentials for database user MOVIESTREAM.](images/graph/graph-login.png " ")
diff --git a/building-blocks/tasks/adb/images/adb-dbactions-goto.png b/building-blocks/tasks/adb/images/adb-dbactions-goto.png
index 44bcea44..49f817d6 100644
Binary files a/building-blocks/tasks/adb/images/adb-dbactions-goto.png and b/building-blocks/tasks/adb/images/adb-dbactions-goto.png differ
diff --git a/building-blocks/tasks/adb/images/graph/change-graph-type.png b/building-blocks/tasks/adb/images/graph/change-graph-type.png
new file mode 100644
index 00000000..ad53719b
Binary files /dev/null and b/building-blocks/tasks/adb/images/graph/change-graph-type.png differ
diff --git a/building-blocks/tasks/adb/images/graph/create-graph-dialog.png b/building-blocks/tasks/adb/images/graph/create-graph-dialog.png
index 6b294be3..fbad9d84 100644
Binary files a/building-blocks/tasks/adb/images/graph/create-graph-dialog.png and b/building-blocks/tasks/adb/images/graph/create-graph-dialog.png differ
diff --git a/building-blocks/tasks/adb/images/graph/create-graph-suggested-model.png b/building-blocks/tasks/adb/images/graph/create-graph-suggested-model.png
index d382a950..aca8fab0 100644
Binary files a/building-blocks/tasks/adb/images/graph/create-graph-suggested-model.png and b/building-blocks/tasks/adb/images/graph/create-graph-suggested-model.png differ
diff --git a/building-blocks/tasks/adb/images/graph/edit-edge-label.png b/building-blocks/tasks/adb/images/graph/edit-edge-label.png
index c72c696d..30897a8a 100644
Binary files a/building-blocks/tasks/adb/images/graph/edit-edge-label.png and b/building-blocks/tasks/adb/images/graph/edit-edge-label.png differ
diff --git a/building-blocks/tasks/adb/images/graph/jobs-create-graph.png b/building-blocks/tasks/adb/images/graph/jobs-create-graph.png
index 49d57741..ba14557c 100644
Binary files a/building-blocks/tasks/adb/images/graph/jobs-create-graph.png and b/building-blocks/tasks/adb/images/graph/jobs-create-graph.png differ
diff --git a/building-blocks/tasks/adb/images/graph/select-tables-pgql.png b/building-blocks/tasks/adb/images/graph/select-tables-pgql.png
new file mode 100644
index 00000000..c21bd792
Binary files /dev/null and b/building-blocks/tasks/adb/images/graph/select-tables-pgql.png differ
diff --git a/building-blocks/tasks/adb/images/graph/selected-tables-pgql.png b/building-blocks/tasks/adb/images/graph/selected-tables-pgql.png
new file mode 100644
index 00000000..6d11e6af
Binary files /dev/null and b/building-blocks/tasks/adb/images/graph/selected-tables-pgql.png differ
diff --git a/building-blocks/tasks/adb/images/graph/warning-window-pgql.png b/building-blocks/tasks/adb/images/graph/warning-window-pgql.png
new file mode 100644
index 00000000..f51b5e51
Binary files /dev/null and b/building-blocks/tasks/adb/images/graph/warning-window-pgql.png differ
diff --git a/building-blocks/tasks/adb/images/graph/warning-window.png b/building-blocks/tasks/adb/images/graph/warning-window.png
new file mode 100644
index 00000000..52eda039
Binary files /dev/null and b/building-blocks/tasks/adb/images/graph/warning-window.png differ
diff --git a/building-blocks/tasks/adb/images/jobs-create-graph.png b/building-blocks/tasks/adb/images/jobs-create-graph.png
new file mode 100644
index 00000000..45d3b051
Binary files /dev/null and b/building-blocks/tasks/adb/images/jobs-create-graph.png differ