diff --git a/game/scripts/cg/luna.rpy b/game/scripts/cg/luna.rpy
index 6700a54e..420f4640 100644
--- a/game/scripts/cg/luna.rpy
+++ b/game/scripts/cg/luna.rpy
@@ -338,75 +338,56 @@ layeredimage lun_grind:
 
     always "lun_grind_background"
 
-    group body:
-        attribute idle "lun_grind_idle" default
-        attribute grind "lun_grind_grind" default
-        attribute spread "lun_grind_spread" default
-        attribute cumshot "lun_grind_cumshot" default
+    group main:
+        attribute idle default
+        attribute grind
+        attribute spread
+        attribute cumshot
 
-image lun_grind_idle:
-    Fixed(
-        "lun_grind_body_idle",
-        "lun_grind_penis_grind_frame0")
+image lun_grind_main_idle:
+    contains:
+        "lun_grind_body_idle"
+    contains:
+        "lun_grind_penis_grind_frame0"
 
-image lun_grind_grind:
-    Fixed(
-        "lun_grind_body_idle",
-        "lun_grind_penis_grind_frame0")
+image lun_grind_main_grind:
+    contains:
+        "lun_grind_body_idle"
+    contains:
+        "lun_grind_penis_grind_frame0"
 
     pause 0.44
 
-    Fixed(
-        "lun_grind_body_grind",
-        "lun_grind_penis_grind_frame1")
+    contains:
+        "lun_grind_body_grind"
+    contains:
+        "lun_grind_penis_grind_frame1"
 
     pause 0.44
     repeat
 
-image lun_grind_spread:
-    Fixed(
-        "lun_grind_body_spread",
-        "lun_grind_penis_grind_frame1")
+image lun_grind_main_spread:
+    contains:
+        "lun_grind_body_spread"
+    contains:
+        "lun_grind_penis_grind_frame1"
 
-image lun_grind_cumshot:
-    Fixed(
-        "lun_grind_body_spread",
-        "lun_grind_penis_grind_frame1",
-        "lun_grind_cumshot_frame0")
-
-    pause 0.12
-    Fixed(
-        "lun_grind_body_spread",
-        "lun_grind_penis_grind_frame1",
-        "lun_grind_cumshot_frame1")
-
-    pause 0.12
-
-    Fixed(
-        "lun_grind_body_spread",
-        "lun_grind_penis_grind_frame1",
-        "lun_grind_cumshot_frame2")
-
-    pause 0.12
-
-    Fixed(
-        "lun_grind_body_spread",
-        "lun_grind_penis_grind_frame1",
-        "lun_grind_cumshot_frame3")
-
-    pause 0.12
-
-    Fixed(
-        "lun_grind_body_spread",
-        "lun_grind_penis_grind_frame1",
-        "lun_grind_cumshot_frame4")
-
-    pause 0.12
-
-    Fixed(
-        "lun_grind_body_spread",
-        "lun_grind_penis_grind_frame1",
-        "lun_grind_cumshot_frame5")
-
-    pause 1
-    repeat
+image lun_grind_main_cumshot:
+    contains:
+        "lun_grind_body_spread"
+    contains:
+        "lun_grind_penis_grind_frame1"
+    contains:
+        "lun_grind_cumshot_frame0"
+        pause 0.12
+        "lun_grind_cumshot_frame1"
+        pause 0.12
+        "lun_grind_cumshot_frame2"
+        pause 0.12
+        "lun_grind_cumshot_frame3"
+        pause 0.12
+        "lun_grind_cumshot_frame4"
+        pause 0.12
+        "lun_grind_cumshot_frame5"
+        pause 1
+        repeat