diff --git a/modes/GM.lua b/modes/GM.lua
index 76b0b2fc..4053d63f 100644
--- a/modes/GM.lua
+++ b/modes/GM.lua
@@ -17,7 +17,6 @@ return{
 	env={
 		noTele=true,
 		minarr=1,
-		_20G=true,
 		drop=0,lock=15,
 		wait=15,fall=6,
 		next=3,
diff --git a/modes/marathon_hard.lua b/modes/marathon_hard.lua
index 8db2344c..2bb31236 100644
--- a/modes/marathon_hard.lua
+++ b/modes/marathon_hard.lua
@@ -6,7 +6,7 @@ local function check(P)
 			P.gameEnv.drop=.25
 			P.gameEnv.target=100
 		elseif T==100 then
-			P.gameEnv._20G=true
+			P._20G=true
 			P.gameEnv.target=200
 		else
 			P:win("finish")
diff --git a/modes/master_advance.lua b/modes/master_advance.lua
index 085a7998..61e377c9 100644
--- a/modes/master_advance.lua
+++ b/modes/master_advance.lua
@@ -43,7 +43,7 @@ return{
 	env={
 		noTele=true,
 		das=6,arr=1,
-		_20G=true,
+		drop=0,
 		lock=death_lock[1],
 		wait=death_wait[1],
 		fall=death_fall[1],
diff --git a/modes/master_beginner.lua b/modes/master_beginner.lua
index 35d98f0f..aeccbc64 100644
--- a/modes/master_beginner.lua
+++ b/modes/master_beginner.lua
@@ -45,7 +45,7 @@ return{
 	env={
 		noTele=true,
 		das=9,arr=3,
-		_20G=true,
+		drop=0,
 		lock=rush_lock[1],
 		wait=rush_wait[1],
 		fall=rush_fall[1],
diff --git a/modes/master_final.lua b/modes/master_final.lua
index 7c58f0ef..71897ede 100644
--- a/modes/master_final.lua
+++ b/modes/master_final.lua
@@ -43,7 +43,7 @@ return{
 	env={
 		noTele=true,
 		das=5,arr=1,
-		_20G=true,lock=12,
+		drop=0,lock=12,
 		wait=10,fall=10,
 		dropPiece=score,
 		freshLimit=15,
diff --git a/modes/tech_lunatic+.lua b/modes/tech_lunatic+.lua
index 7666ebfa..94064a9e 100644
--- a/modes/tech_lunatic+.lua
+++ b/modes/tech_lunatic+.lua
@@ -13,7 +13,7 @@ end
 return{
 	color=color.dRed,
 	env={
-		_20G=true,lock=60,
+		drop=0,lock=60,
 		freshLimit=15,
 		dropPiece=tech_check_hard,
 		bg="matrix",bgm="down",
diff --git a/modes/tech_lunatic.lua b/modes/tech_lunatic.lua
index 2a8c295f..d51a73ae 100644
--- a/modes/tech_lunatic.lua
+++ b/modes/tech_lunatic.lua
@@ -11,7 +11,7 @@ end
 return{
 	color=color.red,
 	env={
-		_20G=true,lock=60,
+		drop=0,lock=60,
 		freshLimit=15,
 		dropPiece=tech_check_easy,
 		bg="matrix",bgm="down",
diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index 19aae09f..f60de8c0 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -252,7 +252,7 @@ function royaleLevelup()
 			P.gameEnv.drop=int(P.gameEnv.drop*.3)
 			if P.gameEnv.drop==0 then
 				P.curY=P.imgY
-				P.gameEnv._20G=true
+				P._20G=true
 				if P.AI_mode=="CC"then CC_switch20G(P)end
 			end
 		end
diff --git a/parts/player.lua b/parts/player.lua
index 49239efd..14f1215d 100644
--- a/parts/player.lua
+++ b/parts/player.lua
@@ -1171,6 +1171,7 @@ end
 local function applyGameEnv(P)--Finish gameEnv processing
 	local ENV=P.gameEnv
 
+	if ENV.drop==0 then P._20G=true end
 	P.dropDelay=ENV.drop
 	P.lockDelay=ENV.lock
 
@@ -1698,7 +1699,7 @@ function player.freshBlock(P,keepGhost,control,system)
 	local ENV=P.gameEnv
 	if not keepGhost and P.cur then
 		P.imgY=min(#P.field+1,P.curY)
-		if ENV._20G or P.keyPressing[7]and ENV.sdarr==0 then
+		if _20G or P.keyPressing[7]and ENV.sdarr==0 then
 			local _=P.imgY
 
 			--Move ghost to bottom
@@ -2417,7 +2418,7 @@ do--player.drop(P)--Place piece
 			end
 
 			--DropSpeed bonus
-			if P.gameEnv._20G then
+			if P._20G then
 				dropScore=dropScore*2
 			elseif P.gameEnv.drop<3 then
 				dropScore=dropScore*1.5