diff --git a/_episodes/ExpertSystem.md b/_episodes/ExpertSystem.md
index f7fe8a5..7c87ec4 100644
--- a/_episodes/ExpertSystem.md
+++ b/_episodes/ExpertSystem.md
@@ -1,14 +1,18 @@
 ---
 title: "Building an expert system for image feature recognition"
-teaching: 15
-exercises: 30
+teaching: 60
+exercises: 55
 questions:
-- "What is our goal?"
+- "What is an expert system?"
 - "Which data are we going to use?"
+- "How can I download my brain into the computer?"
 objectives:
-- "Understand the task goal and obtain the relevant data"
+- "Create a signal detection algorithm for sunquakes given time-distance images"
 keypoints:
-- "TODO Ask questions, experiment, and help others"
+- "Writing an expert system is best done in collaboration with experts"
+- "Break a task down into it's most basic components and replicate them individually"
+- "Our visual system is **amazing** so don't be sad if it takes you a long time to get 1/2 good results from your code"
+- "An alternative to an expert system would be some Machine Learning algorithm, however we still need and expert to help guide the training process"
 ---
 
 # Building an expert system
diff --git a/_episodes/Setup.md b/_episodes/Setup.md
index a136b0c..da718da 100644
--- a/_episodes/Setup.md
+++ b/_episodes/Setup.md
@@ -4,12 +4,12 @@ teaching: 10
 exercises: 10
 questions:
 - "How can I prepare?"
-- "How will we be learning?"
 objectives:
 - "Set expectations for engagement and behavior"
 keypoints:
 - "Ask questions, experiment, and help others"
 - "Everyone is here to learn and that means making mistakes"
+- "I'm not *that* kind of Dr, please excuse my non solar/stellar/space physics expertise"
 ---
 ## Acknowledgement of country
 We wish to acknowledge the custodians of the land we reside on. These lessons were developed on the lands of the Wadjuk (Perth region) people of the Nyoongar nation. Today we meet on the lands of the Jagera, Giabal and Jarowair tribes.  We pay our respect to their Elders and acknowledge their continuing culture and the contribution they make to the life of our cities and regions.