diff --git a/Artificial Intelligence and Machine Learning/sample-code/Notebooks/08-Train-AI-Services.ipynb b/Artificial Intelligence and Machine Learning/sample-code/Notebooks/08-Train-AI-Services.ipynb
index e3b797b..ac6e844 100644
--- a/Artificial Intelligence and Machine Learning/sample-code/Notebooks/08-Train-AI-Services.ipynb	
+++ b/Artificial Intelligence and Machine Learning/sample-code/Notebooks/08-Train-AI-Services.ipynb	
@@ -124,18 +124,19 @@
    },
    "outputs": [],
    "source": [
-    "async Task<bool> ProjectExistsAsync(CustomVisionTrainingClient client, string projectName)\n",
+    "async Task<Project> GetProjectAsync(CustomVisionTrainingClient client, string projectName)\n",
     "{\n",
     "    var projects = await client.GetProjectsAsync();\n",
-    "    return projects.Where(x => x.Name == projectName).Count() > 0 ? true : false;\n",
+    "    return projects.FirstOrDefault(x => x.Name == projectName);\n",
     "}\n",
     "\n",
+    "async Task<bool> ProjectExistsAsync(CustomVisionTrainingClient client, string projectName) => await GetProjectAsync(client, projectName) == null;\n",
+    "\n",
     "async Task<bool> TagExistsAsync(CustomVisionTrainingClient client, string projectName, string tagName)\n",
     "{\n",
-    "    var projects = await client.GetProjectsAsync();\n",
-    "    var project = projects.First(x => x.Name == projectName);\n",
+    "    var project = await GetProjectAsync(client, projectName);\n",
     "    var tags = await client.GetTagsAsync(project.Id);\n",
-    "    return tags.Where(x => x.Name == tagName).Count() > 0 ? true : false;\n",
+    "    return tags.Where(x => x.Name == tagName).Count();\n",
     "}"
    ]
   },
@@ -193,16 +194,14 @@
    "outputs": [],
    "source": [
     "var projectName = \"Infrastructure CV Project\";\n",
-    "var projectExists = await ProjectExistsAsync(trainingClient, projectName);\n",
     "Project project;\n",
-    "if(!projectExists)\n",
+    "if(await ProjectExistsAsync(trainingClient, projectName))\n",
     "{\n",
     "    project = await trainingClient.CreateProjectAsync(\"Infrastructure CV Project\", \"An image classifier to detect cracks in pavement\");\n",
     "}\n",
     "else\n",
     "{\n",
-    "    var projects = await trainingClient.GetProjectsAsync();\n",
-    "    project = projects.First(x => x.Name == projectName);\n",
+    "    project = await GetProjectAsync(trainingClient, projectName);\n",
     "}"
    ]
   },