diff --git a/parts/eventsets/defender_l.lua b/parts/eventsets/defender_l.lua
index 6a018b7b..2b8ebfe9 100644
--- a/parts/eventsets/defender_l.lua
+++ b/parts/eventsets/defender_l.lua
@@ -1,4 +1,6 @@
 return{
+    drop=5,lock=60,
+    fall=6,
     mesDisp=function(P)
         setFont(55)
         mStr(P.modeData.wave,63,200)
@@ -12,7 +14,11 @@ return{
             if P.control then
                 local D=P.modeData
                 D.counter=D.counter+1
-                local t=math.max(240-2*D.wave,40)
+                local t=
+                    D.wave<=60 and 240-2*D.wave or
+                    D.wave<=120 and 120-(D.wave-60)or
+                    D.wave<=180 and math.floor(60-(D.wave-120)*.5)or
+                    30
                 if D.counter>=t then
                     D.counter=0
                     for _=1,4 do
@@ -21,20 +27,18 @@ return{
                     P.atkBufferSum=P.atkBufferSum+4
                     P.stat.recv=P.stat.recv+4
                     D.wave=D.wave+1
-                    if D.wave<=75 then
-                        D.rpm=math.floor(144e3/t)*.1
-                        if D.wave==25 then
-                            P:_showText(text.great,0,-140,100,'appear',.6)
-                            P.gameEnv.pushSpeed=3
-                            P.dropDelay,P.gameEnv.drop=4,4
-                        elseif D.wave==50 then
-                            P:_showText(text.awesome,0,-140,100,'appear',.6)
-                            P.gameEnv.pushSpeed=4
-                            P.dropDelay,P.gameEnv.drop=3,3
-                        elseif D.wave==75 then
-                            P:_showText(text.maxspeed,0,-140,100,'appear',.6)
-                            P.dropDelay,P.gameEnv.drop=2,2
-                        end
+                    D.rpm=math.floor(144e3/t)*.1
+                    if D.wave==60 then
+                        P:_showText(text.great,0,-140,100,'appear',.6)
+                        P.gameEnv.pushSpeed=3
+                        P.dropDelay,P.gameEnv.drop=4,4
+                    elseif D.wave==120 then
+                        P:_showText(text.awesome,0,-140,100,'appear',.6)
+                        P.gameEnv.pushSpeed=4
+                        P.dropDelay,P.gameEnv.drop=3,3
+                    elseif D.wave==180 then
+                        P:_showText(text.maxspeed,0,-140,100,'appear',.6)
+                        P.dropDelay,P.gameEnv.drop=2,2
                     end
                 end
             end
diff --git a/parts/eventsets/defender_n.lua b/parts/eventsets/defender_n.lua
index fa393b15..0b8c3c5c 100644
--- a/parts/eventsets/defender_n.lua
+++ b/parts/eventsets/defender_n.lua
@@ -1,4 +1,6 @@
 return{
+    drop=30,lock=60,
+    fall=10,
     mesDisp=function(P)
         setFont(55)
         mStr(P.modeData.wave,63,200)
@@ -12,7 +14,11 @@ return{
             if P.control then
                 local D=P.modeData
                 D.counter=D.counter+1
-                local t=math.max(360-D.wave*2,60)
+                local t=
+                    D.wave<=60 and 360-D.wave*3 or
+                    D.wave<=120 and 180-(D.wave-60)*2 or
+                    D.wave<=180 and 120-(D.wave-120)or
+                    60
                 if D.counter>=t then
                     D.counter=0
                     for _=1,3 do
@@ -21,20 +27,18 @@ return{
                     P.atkBufferSum=P.atkBufferSum+3
                     P.stat.recv=P.stat.recv+3
                     D.wave=D.wave+1
-                    if D.wave<=90 then
-                        D.rpm=math.floor(108e3/t)*.1
-                        if D.wave==25 then
-                            P:_showText(text.great,0,-140,100,'appear',.6)
-                            P.gameEnv.pushSpeed=2
-                            P.dropDelay,P.gameEnv.drop=20,20
-                        elseif D.wave==50 then
-                            P:_showText(text.awesome,0,-140,100,'appear',.6)
-                            P.gameEnv.pushSpeed=3
-                            P.dropDelay,P.gameEnv.drop=10,10
-                        elseif D.wave==90 then
-                            P.dropDelay,P.gameEnv.drop=5,5
-                            P:_showText(text.maxspeed,0,-140,100,'appear',.6)
-                        end
+                    D.rpm=math.floor(108e3/t)*.1
+                    if D.wave==60 then
+                        P:_showText(text.great,0,-140,100,'appear',.6)
+                        P.gameEnv.pushSpeed=2
+                        P.dropDelay,P.gameEnv.drop=20,20
+                    elseif D.wave==120 then
+                        P:_showText(text.awesome,0,-140,100,'appear',.6)
+                        P.gameEnv.pushSpeed=3
+                        P.dropDelay,P.gameEnv.drop=10,10
+                    elseif D.wave==180 then
+                        P.dropDelay,P.gameEnv.drop=5,5
+                        P:_showText(text.maxspeed,0,-140,100,'appear',.6)
                     end
                 end
             end
diff --git a/parts/modes/defender_l.lua b/parts/modes/defender_l.lua
index 825542f1..1784ac72 100644
--- a/parts/modes/defender_l.lua
+++ b/parts/modes/defender_l.lua
@@ -1,8 +1,6 @@
 return{
     color=COLOR.red,
     env={
-        drop=5,lock=60,
-        fall=6,
         nextCount=3,
         freshLimit=15,
         pushSpeed=2,
diff --git a/parts/modes/defender_n.lua b/parts/modes/defender_n.lua
index 71fbf102..c11d29ba 100644
--- a/parts/modes/defender_n.lua
+++ b/parts/modes/defender_n.lua
@@ -1,8 +1,6 @@
 return{
     color=COLOR.green,
     env={
-        drop=30,lock=60,
-        fall=10,
         nextCount=3,
         freshLimit=15,
         pushSpeed=1,