diff --git a/StartingPoint/runner_gui.py b/StartingPoint/runner_gui.py
index 46f1bb9..b6faec1 100644
--- a/StartingPoint/runner_gui.py
+++ b/StartingPoint/runner_gui.py
@@ -4,8 +4,8 @@ import sys
 
 # load generated Statechart code
 from srcgen.water_level_simulator import WaterLevelSimulator
-# from srcgen.lock_controller import LockController
-from srcgen.solution import Solution as LockController # Teacher's solution
+from srcgen.lock_controller import LockController
+# from srcgen.solution import Solution as LockController # Teacher's solution
 
 from lib.yakindu.rx import Observer
 from lib.controller import Controller, pretty_time
diff --git a/StartingPoint/runner_tests.py b/StartingPoint/runner_tests.py
index 1b7f00e..e466c8c 100644
--- a/StartingPoint/runner_tests.py
+++ b/StartingPoint/runner_tests.py
@@ -1,8 +1,8 @@
 import functools
 from lib.test import run_scenarios
 
-# from srcgen.lock_controller import LockController
-from srcgen.solution import Solution as LockController # Teacher's solution
+from srcgen.lock_controller import LockController
+# from srcgen.solution import Solution as LockController # Teacher's solution
 
 # For each test scenario, sends a sequence of timed input events to the statechart, and checks if the expected sequence of timed output events occurs.