diff --git a/Zframework/languages.lua b/Zframework/languages.lua
index 0da3dbba..25e2daec 100644
--- a/Zframework/languages.lua
+++ b/Zframework/languages.lua
@@ -407,8 +407,8 @@ local langList={
 			["round_3"]=			{"回合制",		"困难",		"下棋模式"},
 			["round_4"]=			{"回合制",		"疯狂",		"下棋模式"},
 			["round_5"]=			{"回合制",		"极限",		"下棋模式"},
-			["master_beginner"]=	{"大师",		"疯狂",		"20G:初心者适用"},
-			["master_adavnce"]=		{"大师",		"极限",		"20G:上级者的挑战"},
+			["master_beginner"]=	{"大师",		"疯狂",		"20G初心者练习"},
+			["master_advance"]=		{"大师",		"极限",		"上级者20G挑战"},
 			["master_final"]=		{"大师",		"终点",		"究极20G:无法触及的终点"},
 			["GM"]=					{"宗师",		"GM",		"成为方块大师"},
 			["blind_easy"]=			{"隐形",		"半隐",		"不强大脑"},
@@ -862,8 +862,8 @@ local langList={
 			["round_3"]=			{"回合制",		"困难",		"下棋模式"},
 			["round_4"]=			{"回合制",		"疯狂",		"下棋模式"},
 			["round_5"]=			{"回合制",		"极限",		"下棋模式"},
-			["master_beginner"]=	{"大师",		"疯狂",		"20G:初心者适用"},
-			["master_adavnce"]=		{"大师",		"极限",		"20G:上级者的挑战"},
+			["master_beginner"]=	{"大师",		"疯狂",		"20G初心者练习"},
+			["master_advance"]=		{"大师",		"极限",		"上级者20G挑战"},
 			["master_final"]=		{"大师",		"终点",		"究极20G:无法触及的终点"},
 			["GM"]=					{"宗师",		"GM",		"成为方块大师"},
 			["blind_easy"]=			{"隐形",		"半隐",		"不强大脑"},
@@ -1306,8 +1306,8 @@ local langList={
 			["round_3"]=			{"Turn-Based",		"HARD",			"Chess mode"},
 			["round_4"]=			{"Turn-Based",		"LUNATIC",		"Chess mode"},
 			["round_5"]=			{"Turn-Based",		"ULTIMATE",		"Chess mode"},
-			["master_beginner"]=	{"Master",			"LUNATIC",		"20G: For beginners."},
-			["master_adavnce"]=		{"Master",			"ULTIMATE",		"20G: Professional challenge!"},
+			["master_beginner"]=	{"Master",			"LUNATIC",		"For 20G beginners."},
+			["master_advance"]=		{"Master",			"ULTIMATE",		"Professional 20G challenge!"},
 			["master_final"]=		{"Master",			"FINAL",		"20G: Unreachable end point!"},
 			["GM"]=					{"GrandMaster",		"GM",			"To be Grand Master"},
 			["blind_easy"]=			{"Blind",			"HALF",			"For novice players."},
@@ -1746,8 +1746,8 @@ local langList={
 			["round_3"]=			{"Turn-Based",		"HARD",			"Chess mode"},
 			["round_4"]=			{"Turn-Based",		"LUNATIC",		"Chess mode"},
 			["round_5"]=			{"Turn-Based",		"ULTIMATE",		"Chess mode"},
-			["master_beginner"]=	{"Master",			"LUNATIC",		"20G: For beginners."},
-			["master_adavnce"]=		{"Master",			"ULTIMATE",		"20G: Professional challenge!"},
+			["master_beginner"]=	{"Master",			"LUNATIC",		"For 20G beginners."},
+			["master_advance"]=		{"Master",			"ULTIMATE",		"Professional 20G challenge!"},
 			["master_final"]=		{"Master",			"FINAL",		"20G: Unreachable end point!"},
 			["GM"]=					{"GrandMaster",		"GM",			"To be Grand Master"},
 			["blind_easy"]=			{"Blind",			"HALF",			"For novice players."},
diff --git a/modes/master_adavnce.lua b/modes/master_advance.lua
similarity index 88%
rename from modes/master_adavnce.lua
rename to modes/master_advance.lua
index 38f235d2..a55ad8a9 100644
--- a/modes/master_adavnce.lua
+++ b/modes/master_advance.lua
@@ -56,10 +56,10 @@ return{
 		mStr((P.modeData.event+1)*100,-81,370)
 		gc.rectangle("fill",-125,375,90,4)
 	end,
-	score=function(P)return{P.modeData.point,P.stat.row,P.stat.time}end,
-	scoreDisp=function(D)return D[1].."P   "..D[2].."L   "..toTime(D[3])end,
+	score=function(P)return{P.modeData.point,P.stat.time}end,
+	scoreDisp=function(D)return D[1].."P   "..toTime(D[2])end,
 	comp=function(a,b)
-		return a[1]>b[1]or(a[1]==b[1]and(a[2]<b[2]or a[2]==b[2]and a[3]<b[3]))
+		return a[1]>b[1]or(a[1]==b[1]and a[2]<b[2])
 	end,
 	getRank=function(P)
 		local S=P.modeData.point
diff --git a/modes/master_beginner.lua b/modes/master_beginner.lua
index 579c09ef..74c6c615 100644
--- a/modes/master_beginner.lua
+++ b/modes/master_beginner.lua
@@ -60,25 +60,25 @@ return{
 		mStr((P.modeData.event+1)*100,-81,370)
 		gc.rectangle("fill",-125,375,90,4)
 	end,
-	score=function(P)return{P.modeData.point,P.stat.row,P.stat.time}end,
-	scoreDisp=function(D)return D[1].."P   "..D[2].."L   "..toTime(D[3])end,
+	score=function(P)return{P.modeData.point,P.stat.time}end,
+	scoreDisp=function(D)return D[1].."P   "..toTime(D[2])end,
 	comp=function(a,b)
-		return a[1]>b[1]or(a[1]==b[1]and(a[2]<b[2]or a[2]==b[2]and a[3]<b[3]))
+		return a[1]>b[1]or(a[1]==b[1]and a[2]<b[2])
 	end,
 	getRank=function(P)
 		local S=P.modeData.point
 		if S==500 then
-			local L=P.stat.clears[4]
+			local T=P.stat.time
 			return
-			L>=30 and 5 or
-			L>=25 and 4 or
+			T<=170 and 5 or
+			T<=200 and 4 or
 			3
 		else
 			return
-			S>=420 and 3 or
-			S>=250 and 2 or
-			S>=120 and 1 or
-			S>=30 and 0
+			S>=460 and 3 or
+			S>=350 and 2 or
+			S>=200 and 1 or
+			S>=50 and 0
 		end
 	end,
 }
\ No newline at end of file
diff --git a/parts/modes.lua b/parts/modes.lua
index 74beb98f..30591909 100644
--- a/parts/modes.lua
+++ b/parts/modes.lua
@@ -27,8 +27,8 @@ return{
 		{name="round_4",					x=-900,		y=-800,		size=35,shape=1,icon="round",		unlock={"round_5"}},
 		{name="round_5",					x=-1100,	y=-800,		size=35,shape=1,icon="round",		unlock={}},
 
-		{name="master_beginner",			x=0,		y=-1000,	size=35,shape=1,icon="master",		unlock={"master_adavnce"}},
-		{name="master_adavnce",				x=0,		y=-1200,	size=35,shape=1,icon="master",		unlock={"master_final","GM"}},
+		{name="master_beginner",			x=0,		y=-1000,	size=35,shape=1,icon="master",		unlock={"master_advance"}},
+		{name="master_advance",				x=0,		y=-1200,	size=35,shape=1,icon="master",		unlock={"master_final","GM"}},
 		{name="master_final",				x=0,		y=-1400,	size=40,shape=2,icon="master",		unlock={}},
 		{name="GM",							x=150,		y=-1500,	size=35,shape=1,icon="master",		unlock={}},