diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt
index 7d9183f..3e94592 100644
--- a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt
+++ b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt
@@ -14,16 +14,19 @@ import kotlin.time.Duration.Companion.seconds
 
 fun ShowBuilderContext.act1() = act("1. Akt") {
     scene("Ouvertüre [4]") {
-        lightStep(StepCue.Custom("10")) { FrontLights.all { it.brightness.static(10.percent) } }
-        lightStep(StepCue.Custom("20")) { FrontLights.all { it.brightness.static(20.percent) } }
-        lightStep(StepCue.Custom("30")) { FrontLights.all { it.brightness.static(30.percent) } }
-        lightStep(StepCue.Custom("40")) { FrontLights.all { it.brightness.static(40.percent) } }
-        lightStep(StepCue.Custom("50")) { FrontLights.all { it.brightness.static(50.percent) } }
-        lightStep(StepCue.Custom("60")) { FrontLights.all { it.brightness.static(60.percent) } }
-        lightStep(StepCue.Custom("70")) { FrontLights.all { it.brightness.static(70.percent) } }
-        lightStep(StepCue.Custom("80")) { FrontLights.all { it.brightness.static(80.percent) } }
-        lightStep(StepCue.Custom("90")) { FrontLights.all { it.brightness.static(90.percent) } }
-        lightStep(StepCue.Custom("100")) { FrontLights.all { it.brightness.static(100.percent) } }
+        lightStep(StepCue.Custom("On")) {
+            Washs.both {
+                it.pointAtCeiling()
+                it.brightness.static(100.percent)
+                it.beamAngle.static(100.percent)
+            }
+        }
+
+        lightStep(StepCue.Custom("Off")) {
+            Washs.both {
+                it.beamAngle.static(0.percent)
+            }
+        }
 
         step(StepCue.MusicStart("Ouvertüre", 1.minutes)) {
             curtainState = CurtainState.CLOSED
diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/device/CoemarProWash.kt b/src/main/kotlin/de/moritzruth/dracula_musical/device/CoemarProWash.kt
index 8c0e045..730397d 100644
--- a/src/main/kotlin/de/moritzruth/dracula_musical/device/CoemarProWash.kt
+++ b/src/main/kotlin/de/moritzruth/dracula_musical/device/CoemarProWash.kt
@@ -93,9 +93,7 @@ class CoemarProWash(override val firstChannel: DmxAddress, private val invertAng
         writer.writeRaw(DmxValue(0u)) // dimmer and color speed = maximum
         writer.writeRaw(DmxValue(0u)) // colour macro = off
 
-        // TODO: Fix
-//        writer.writeRaw(DmxValue((beamAngle.getCurrentValue().value * 54 + 125).roundToInt().toUByte()))
-        writer.writeRaw(DmxValue(0u))
+        writer.writeRaw(DmxValue((beamAngle.getCurrentValue().ofRange(125.0..179.0)).roundToInt().toUByte()))
 
         writer.writeRaw(DmxValue(0u)) // no function
         writer.writeRaw(DmxValue(strobeSpeed.getCurrentValue().ofRange(63.0..95.0).roundToInt().toUByte()))