diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
index 1f819ba22..b44cd01b3 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
@@ -54,7 +54,7 @@
       <CommandLineArguments>
          <CommandLineArgument
             argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Soft/Master System/R-Type (NTSC).sms&quot;"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "&quot;/Users/thomasharte/Library/Mobile\ Documents/com\~apple\~CloudDocs/Soft/Archimedes/Lemmings.adf&quot;"
@@ -64,6 +64,10 @@
             argument = "--new=zxspectrum"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--display=CompositeColour"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "/Users/thomasharte/Downloads/Program/Program.prg"
             isEnabled = "NO">
diff --git a/Outputs/OpenGL/ScanTarget.cpp b/Outputs/OpenGL/ScanTarget.cpp
index 87680991d..ebe5c2e7f 100644
--- a/Outputs/OpenGL/ScanTarget.cpp
+++ b/Outputs/OpenGL/ScanTarget.cpp
@@ -260,18 +260,25 @@ void ScanTarget::setup_pipeline() {
 	// New pipeline starts here!
 	//
 	const auto buffer_width = FilterGenerator::SuggestedBufferWidth;
+	const auto subcarrier_frequency = [](const Modals &modals) {
+		return float(modals.colour_cycle_numerator) / float(modals.colour_cycle_denominator);
+	};
 	const float sample_multiplier =
-		FilterGenerator::suggested_sample_multiplier(227.5f, 1320);
+		FilterGenerator::suggested_sample_multiplier(
+			subcarrier_frequency(modals),
+			modals.cycles_per_line
+		);
 
-	if(copy_shader_.empty()) {
-		copy_shader_ = copy_shader(api_, GL_TEXTURE4, {}, {});
-	}
+//	if(copy_shader_.empty()) {
+//		copy_shader_ = copy_shader(api_, GL_TEXTURE4, {}, {});
+//	}
 
 	if(
 		!existing_modals_ ||
 		existing_modals_->input_data_type != modals.input_data_type ||
 		existing_modals_->display_type != modals.display_type ||
-		existing_modals_->composite_colour_space != modals.composite_colour_space
+		existing_modals_->composite_colour_space != modals.composite_colour_space ||
+		subcarrier_frequency(*existing_modals_) != subcarrier_frequency(modals)
 	) {
 		composition_shader_ = OpenGL::composition_shader(
 			api_,