diff --git a/_config.yml b/_config.yml
index 3c402b01..9eea44c3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -82,10 +82,9 @@ episode_order:
   - 04-modules
   - 03-break1
   - 05-scheduler
-  - 06-lunch
   - 064-parallel
-  - 07-resources
   - 08-break2
+  - 07-resources
   - 09-scaling
 
 
@@ -123,7 +122,7 @@ working_dir:
 
 # Start time in minutes (0 to be clock-independent, 540 to show a start at 09:00 am).
 # 600 is 10am
-start_time: 600
+start_time: 540
 # Start time for people wanting to skip bash content
 hpc_start_time: 780
 # Lesson to start at.
diff --git a/_episodes/02-filesystem.md b/_episodes/02-filesystem.md
index 0c4671a6..4dd10f59 100644
--- a/_episodes/02-filesystem.md
+++ b/_episodes/02-filesystem.md
@@ -1,15 +1,15 @@
 ---
 title: "NeSI Filesystem"
-teaching: 30
-exercises: 10
+teaching: 15
+exercises: 5
 questions:
-- "How can I move around the cluster filesystem"
-- "How can I see what files and directories I have?"
-- "How can I make new files and directories."
+- "Where is the best place to store my data?"
+- "How do I recover deleted files?"
+- "How do I find out how much disk space I have?"
 objectives:
-- "Create, edit, manipulate and remove files from command line"
+- "Learn about the NeSI filesystems, and when to use each one."
 keypoints:
-- "The file system is responsible for managing information on the disk."
+- ""
 
 ---
 
diff --git a/_episodes/04-modules.md b/_episodes/04-modules.md
index d0812c54..232bcae1 100644
--- a/_episodes/04-modules.md
+++ b/_episodes/04-modules.md
@@ -1,7 +1,7 @@
 ---
 title: "Accessing software via Modules"
-teaching: 20
-exercises: 10
+teaching: 15
+exercises: 5
 questions:
 - "How do we load and unload software packages?"
 objectives: