diff --git a/image/event/image_template4 b/image/event/image_template4
index 0971b7ed..365fbd1f 100644
--- a/image/event/image_template4
+++ b/image/event/image_template4
@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
-normal_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
-press_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
-press_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
-disable_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
-disable_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+normal_eng=ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png
+normal_thai=ROOT/taobin_project/image/event/powerup_free_1/powerup.png
+press_eng=ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png
+press_thai=ROOT/taobin_project/image/event/powerup_free_1/powerup.png
+disable_eng=ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png
+disable_thai=ROOT/taobin_project/image/event/powerup_free_1/powerup.png
diff --git a/image/event/powerup_free_1/powerup.png b/image/event/powerup_free_1/powerup.png
index bf4d1b9d..5ae6271d 100644
Binary files a/image/event/powerup_free_1/powerup.png and b/image/event/powerup_free_1/powerup.png differ
diff --git a/image/event/powerup_free_1/powerup_en.png b/image/event/powerup_free_1/powerup_en.png
new file mode 100644
index 00000000..bfbcc0d9
Binary files /dev/null and b/image/event/powerup_free_1/powerup_en.png differ
diff --git a/inter/mys/image/event/mys_promo_fruity_raya.png b/inter/mys/image/event/mys_promo_fruity_raya.png
new file mode 100644
index 00000000..dc3adb65
Binary files /dev/null and b/inter/mys/image/event/mys_promo_fruity_raya.png differ
diff --git a/xml/event/powerup_free_1/page_powerup_bridge.xml b/xml/event/powerup_free_1/page_powerup_bridge.xml
index 5fb2eb6a..26f0f744 100644
--- a/xml/event/powerup_free_1/page_powerup_bridge.xml
+++ b/xml/event/powerup_free_1/page_powerup_bridge.xml
@@ -1,5 +1,3 @@
-; TODO: like y20, but without age check instead check usage of that id.
-
 <Popup>
     <Cache> "Enable" </Cache>
     <Width> 1080 </Width>
diff --git a/xml/event/powerup_free_1/page_powerup_identity.xml b/xml/event/powerup_free_1/page_powerup_identity.xml
index e7268d67..2c8687be 100644
--- a/xml/event/powerup_free_1/page_powerup_identity.xml
+++ b/xml/event/powerup_free_1/page_powerup_identity.xml
@@ -71,6 +71,7 @@
     Var FailTrickCount = 0
 
     Var FailState = "Invisible"
+    Var FullQuotaState = "Invisible"
 
     Var StepGetServer = 0
 
@@ -86,6 +87,25 @@
 
     DEBUGVAR Ext1a
 
+    ; example
+
+    If StepGetServer = 1 Then
+
+        If Ext1a = "0" Then
+            If LegitAge = "true" Then
+                Var RoadShow = "true"
+                Open "ROOT/taobin_project/xml/page_payment.xml"
+            Else
+                Var load_gif_stage = "Invisible"
+                Var FailState = "Enable"
+            EndIf
+            Refresh
+        Else
+            Var FullQuotaState = "Enable"
+        EndIf
+
+    EndIf
+
     ; If StepGetServer = 1 Then
 
     ;     If Ext1a = "ok" Then
@@ -117,6 +137,11 @@
 </EventActionOk>
 
 <EventActionError>
+
+    ; handle quota full
+    ; response smth
+    Var FullQuotaState = "Enable"
+
 </EventActionError>
 
 
@@ -222,9 +247,12 @@
 
                 If AgeNumber >= 18 Then
                     ; TODO: check quota --- AddData; Wait for new add num
+
+                    Var LegitAge = "true"
+
                     ; Then enable RoadShow
-                    Var RoadShow = "true"
-                    Open "ROOT/taobin_project/xml/page_payment.xml"
+                    ;Var RoadShow = "true"
+                    ;Open "ROOT/taobin_project/xml/page_payment.xml"
                 EndIf
 
 
@@ -356,6 +384,7 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+    Var RoadShow = ""
 	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
 </EventClick>
 </Button>
@@ -370,6 +399,7 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+    Var RoadShow = ""
 	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
 </EventClick>
 </Button>
@@ -424,7 +454,41 @@ eval(
 </Button>
 
 
+; Full Quota
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> FullQuotaState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
+</Image>
 
+<Image>
+<X> 249 </X>
+<Y> 751 </Y>
+<State> FullQuotaState </State>
+<Filename> eval(
+    If show_eng = "true" Then
+        Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup_quota_full_en.png"
+    Else
+        Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup_quota_full.png"
+    EndIf
+) </Filename>
+</Image>
+
+<Button>
+<X> 350 </X>
+<Y> 1370 </Y>
+<State>FullQuotaState</State>
+<Filename> Var( DirImage + "/bn_cancel_all.png"  )</Filename>
+<FilenamePress> Var( DirImage + "/bp_cancel_all.png"  ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_cancel_all.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var RoadShow = ""
+	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+</EventClick>
+</Button>
 
 <GIF>
 <X> 440 </X>
@@ -448,7 +512,7 @@ eval(
     EventEvaluate "EventIDCard"
 </EventUnitTest2>
 <EventUnitTest3>
-    Var FailState = "Enable"
+    Var FullQuotaState = "Enable"
 </EventUnitTest3>
 
 <EventUnitTest4>
diff --git a/xml/event/promotion_powerup_free_1.xml b/xml/event/promotion_powerup_free_1.xml
index 15bfebfe..2a00539b 100644
--- a/xml/event/promotion_powerup_free_1.xml
+++ b/xml/event/promotion_powerup_free_1.xml
@@ -11327,7 +11327,7 @@ LIMENADE SODA" </Value>
     <Filename>
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png"
         Else
             Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
         EndIf
@@ -11336,7 +11336,7 @@ LIMENADE SODA" </Value>
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png"
         Else
             Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
         EndIf
@@ -11345,7 +11345,7 @@ LIMENADE SODA" </Value>
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png"
         Else
             Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
         EndIf
diff --git a/xml/event/promotion_template4.inc b/xml/event/promotion_template4.inc
index 2a9669dc..b4c68567 100644
--- a/xml/event/promotion_template4.inc
+++ b/xml/event/promotion_template4.inc
@@ -1,4 +1,3 @@
-
 <Button>
     <X> 42 </X>
     <Y> 520 </Y>
@@ -7,27 +6,27 @@
     <Filename>
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = ###normal_eng
         Else
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = ###normal_thai
         EndIf
         )
      </Filename>
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = ###normal_eng
         Else
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = ###normal_thai
         EndIf
         )
      </FilenamePress>
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = ###normal_eng
         Else
-            Var return = "ROOT/taobin_project/image/event/powerup_free_1/powerup.png"
+            Var return = ###normal_thai
         EndIf
         )
      </FilenameDisable>
diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev
index c9b5d0a4..755af9b6 100644
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@@ -18,16 +18,25 @@ Else
 	If OpenFromPageBoard = 1 Then
 		DEBUGVAR FreeEnergyDrink
 		DEBUGVAR BigButtonEnable
-		If FreeEnergyDrink = 1 Then
-			Var FreePowerup = "Enable"
-			Var BigButtonEnable = "Enable"
-			
-			OpenInst 2 "ROOT/taobin_project/xml/event/promotion_powerup_free_1.xml"
 
-			Var OpenFromPageBoard = 0
+		; check profile to enable free energy drink promotion
+		STRCONTAIN "ProEnergyDrinkFreePerCardID" XMLProfile EnableFreeEnergyDrink
+
+		If EnableFreeEnergyDrink = "true" Then
+			If FreeEnergyDrink = 1 Then
+				Var FreePowerup = "Enable"
+				Var BigButtonEnable = "Enable"
+				
+				OpenInst 2 "ROOT/taobin_project/xml/event/promotion_powerup_free_1.xml"
+
+				Var OpenFromPageBoard = 0
+			Else
+				Var FreePowerup = "Invisible"
+				OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+			EndIf
 		Else
 			Var FreePowerup = "Invisible"
-			OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+			OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
 		EndIf
 	Else
 		DEBUGVAR FreeEnergyDrink
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 6f2ed4bf..53b283b7 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -38,11 +38,6 @@
 	If Seeker = "curr" Then
 		Var LastMakeDrinkResult = "-"
 	EndIf
-	
-	If FreeEnergyDrink = 1 Then
-		; reset
-		Var RoadShow = ""
-	EndIf
 
 	If show_eng = "true" Then 
 		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" 
@@ -283,7 +278,16 @@
 		Var ShowCountDownBrewing = CountDownBrewing
 
 		If RoadShow = "true" Then
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
+
+			If FreeEnergyDrink = 1 Then
+				; reset
+				Var RoadShow = ""
+				; AddData
+
+				; +1 in quota in this id card
+				AddData <ID> <user-id> <menu?>
+			EndIf
+			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		Else
 
 			Var Seeker.OrderChanel = Seeker.OrderChanel + ":"