diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv
index 7ca49596..fbccfb9f 100644
--- a/animation01/Menu Description - Sheet1.tsv	
+++ b/animation01/Menu Description - Sheet1.tsv	
@@ -141,6 +141,11 @@ Hot strawberry tea	12-02-01-0022	1	10	19							24	90	1:30	43
 Iced strawberrry tea	12-02-02-0022	1	10	19	23						24	85	1:25	27
 STRAWBERRY SHAKE	12-04-02-0013	1	25	26	19	17	23				24	178	2:58	35
 														
+ETHIOPAI BLUE DADDY DIRTY	12-01-02-0020	1	7	36	2	3	4	5			24	100	22:40	32
+HOT AMERICANO BLUE DADDY	12-01-01-0019 	1	36	2	3	4	5	16			24	88	1:28	32
+ICED AMERICANO BLUE DADDY	12-01-02-0019	1	36	2	3	4	5	23	16		24	133	2:13	32
+ESPRESSO BLUE DADDY	12-01-01-0020	1	36	2	3	4	5				24	66	1:06	32
+														
 														
 														
 Espresso	14-01-01-0001	1	2	3	4	5					24	66	1:06	16
diff --git a/animation01/TaoBin2_draft02_art36.mp4 b/animation01/TaoBin2_draft02_art36.mp4
new file mode 100644
index 00000000..4e1ff8c1
Binary files /dev/null and b/animation01/TaoBin2_draft02_art36.mp4 differ
diff --git a/image/main_page/bn_remove_cup.png b/image/main_page/bn_remove_cup.png
index 1f724b90..70adf3fa 100644
Binary files a/image/main_page/bn_remove_cup.png and b/image/main_page/bn_remove_cup.png differ
diff --git a/image/main_page/bp_remove_cup-1.png b/image/main_page/bp_remove_cup-1.png
new file mode 100644
index 00000000..bf94f568
Binary files /dev/null and b/image/main_page/bp_remove_cup-1.png differ
diff --git a/image/main_page/bp_remove_cup.png b/image/main_page/bp_remove_cup.png
index b4296bde..4dfef076 100644
Binary files a/image/main_page/bp_remove_cup.png and b/image/main_page/bp_remove_cup.png differ
diff --git a/image/page_doing/txt_23.png b/image/page_doing/txt_23.png
index bff759aa..c1478061 100644
Binary files a/image/page_doing/txt_23.png and b/image/page_doing/txt_23.png differ
diff --git a/image/page_doing/txt_36.png b/image/page_doing/txt_36.png
new file mode 100644
index 00000000..19a82131
Binary files /dev/null and b/image/page_doing/txt_36.png differ
diff --git a/image/page_doing/txt_36_en.png b/image/page_doing/txt_36_en.png
new file mode 100644
index 00000000..4ce7cd7a
Binary files /dev/null and b/image/page_doing/txt_36_en.png differ
diff --git a/image/page_drink/bn_dirty_light_bluedaddy.png b/image/page_drink/bn_dirty_light_bluedaddy.png
new file mode 100644
index 00000000..67f80b8d
Binary files /dev/null and b/image/page_drink/bn_dirty_light_bluedaddy.png differ
diff --git a/image/page_drink/bn_hot_americano_light_bluedaddy.png b/image/page_drink/bn_hot_americano_light_bluedaddy.png
new file mode 100644
index 00000000..112b3736
Binary files /dev/null and b/image/page_drink/bn_hot_americano_light_bluedaddy.png differ
diff --git a/image/page_drink/bn_hot_espresso_light_bluedaddy.png b/image/page_drink/bn_hot_espresso_light_bluedaddy.png
new file mode 100644
index 00000000..90096ead
Binary files /dev/null and b/image/page_drink/bn_hot_espresso_light_bluedaddy.png differ
diff --git a/image/page_drink/bn_iced_americano_light_bluedaddy.png b/image/page_drink/bn_iced_americano_light_bluedaddy.png
new file mode 100644
index 00000000..16c58828
Binary files /dev/null and b/image/page_drink/bn_iced_americano_light_bluedaddy.png differ
diff --git a/image/page_drink_disable/bn_dirty_light_bluedaddy.png b/image/page_drink_disable/bn_dirty_light_bluedaddy.png
new file mode 100644
index 00000000..e240a5e4
Binary files /dev/null and b/image/page_drink_disable/bn_dirty_light_bluedaddy.png differ
diff --git a/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png b/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png
new file mode 100644
index 00000000..b94e5457
Binary files /dev/null and b/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png differ
diff --git a/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png b/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png
new file mode 100644
index 00000000..7e11c7e8
Binary files /dev/null and b/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png differ
diff --git a/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png b/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png
new file mode 100644
index 00000000..8b021800
Binary files /dev/null and b/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png differ
diff --git a/image/page_drink_press/bn_dirty_light_bluedaddy.png b/image/page_drink_press/bn_dirty_light_bluedaddy.png
new file mode 100644
index 00000000..00960265
Binary files /dev/null and b/image/page_drink_press/bn_dirty_light_bluedaddy.png differ
diff --git a/image/page_drink_press/bn_hot_americano_light_bluedaddy.png b/image/page_drink_press/bn_hot_americano_light_bluedaddy.png
new file mode 100644
index 00000000..4c4c8568
Binary files /dev/null and b/image/page_drink_press/bn_hot_americano_light_bluedaddy.png differ
diff --git a/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png b/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png
new file mode 100644
index 00000000..c50856a5
Binary files /dev/null and b/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png differ
diff --git a/image/page_drink_press/bn_iced_americano_light_bluedaddy.png b/image/page_drink_press/bn_iced_americano_light_bluedaddy.png
new file mode 100644
index 00000000..85343be8
Binary files /dev/null and b/image/page_drink_press/bn_iced_americano_light_bluedaddy.png differ
diff --git a/image/page_drink_select/bn_dirty_light_bluedaddy.png b/image/page_drink_select/bn_dirty_light_bluedaddy.png
new file mode 100644
index 00000000..77933135
Binary files /dev/null and b/image/page_drink_select/bn_dirty_light_bluedaddy.png differ
diff --git a/image/page_drink_select/bn_hot_americano_light_bluedaddy.png b/image/page_drink_select/bn_hot_americano_light_bluedaddy.png
new file mode 100644
index 00000000..11d19ae7
Binary files /dev/null and b/image/page_drink_select/bn_hot_americano_light_bluedaddy.png differ
diff --git a/image/page_drink_select/bn_hot_espresso_light_bluedaddy.png b/image/page_drink_select/bn_hot_espresso_light_bluedaddy.png
new file mode 100644
index 00000000..5566e157
Binary files /dev/null and b/image/page_drink_select/bn_hot_espresso_light_bluedaddy.png differ
diff --git a/image/page_drink_select/bn_iced_americano_light_bluedaddy.png b/image/page_drink_select/bn_iced_americano_light_bluedaddy.png
new file mode 100644
index 00000000..30fad228
Binary files /dev/null and b/image/page_drink_select/bn_iced_americano_light_bluedaddy.png differ
diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv
index 7688f12d..e05861df 100644
--- a/sheet/best_seller.tsv
+++ b/sheet/best_seller.tsv
@@ -1,5 +1,6 @@
 17/1/21	
 12-01-02-0018
+12-01-02-0020
 12-05-02-0029
 12-01-01-0001
 12-01-01-0003
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 51146168..16e9bb15 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -4,7 +4,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1312 </Height>
-<Background> "0xEFEDEA" </Background>
+<Background> "0xFF0000" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	TopView "hide"
@@ -421,6 +421,7 @@
 	EndIf
 	
 	;DEBUGVAR CupOnArm
+	;Var CupOnArm = "true"
 
 	If CupOnArm = "true" Then
 		Var buttonRemoveCup = "Enable"
@@ -587,11 +588,11 @@
 
 
 <Button>
-<X> 840 </X>
-<Y> 634 </Y>
+<X> 780 </X>
+<Y> 630 </Y>
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
-<Interval> 300 </Interval>
+<Interval> 500 </Interval>
 <Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
 <Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
 <EventClick> 
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 2b5c4284..1c703978 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -9,10 +9,12 @@
  product_code = []
  product_code.append('12-01-01-0001')
  product_code.append('12-01-01-0013')
+ product_code.append('12-01-01-0020')
 
  product_code.append('12-11-01-0001')
  product_code.append('12-01-01-0003')
  product_code.append('12-01-01-0014')
+ product_code.append('12-01-01-0019')
 
  product_code.append('12-01-01-0004')
 
@@ -27,11 +29,13 @@
  product_code.append('12-01-01-0012')
  product_code.append('12-01-01-0017')
  product_code.append('12-01-02-0018')
+ product_code.append('12-01-02-0020')
  
 
  product_code.append('12-11-02-0001')
  product_code.append('12-01-02-0001')
  product_code.append('12-01-02-0011')
+ product_code.append('12-01-02-0019')
 
  product_code.append('12-01-02-0002')
  product_code.append('12-11-02-0002')
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index 1efb41d5..4240c512 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -448,7 +448,100 @@
 	<Value> $12-01-01-0013.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=3 12-11-01-0001 
+	; button i=3 12-01-01-0020 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0020.Button  </State> 
+	<Button>
+	<State> $12-01-01-0020.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0020.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0020.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0020.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0020.Self
+		Var NameDrink = $12-01-01-0020.NameE
+		Var NameDrinkTH = $12-01-01-0020.Name
+		Var DrinkDescriptionTH = $12-01-01-0020.description
+		Var DrinkDescription = $12-01-01-0020.descriptionE
+		Var PriceDrink = $12-01-01-0020.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0020.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-01-0020.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0020.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0020.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0020.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0020.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=4 12-11-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -541,7 +634,7 @@
 	<Value> $12-11-01-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=4 12-01-01-0003 
+	; button i=5 12-01-01-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -634,7 +727,7 @@
 	<Value> $12-01-01-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=5 12-01-01-0014 
+	; button i=6 12-01-01-0014 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -727,7 +820,100 @@
 	<Value> $12-01-01-0014.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=6 12-01-01-0004 
+	; button i=7 12-01-01-0019 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0019.Button  </State> 
+	<Button>
+	<State> $12-01-01-0019.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0019.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0019.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0019.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0019.Self
+		Var NameDrink = $12-01-01-0019.NameE
+		Var NameDrinkTH = $12-01-01-0019.Name
+		Var DrinkDescriptionTH = $12-01-01-0019.description
+		Var DrinkDescription = $12-01-01-0019.descriptionE
+		Var PriceDrink = $12-01-01-0019.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0019.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-01-0019.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0019.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0019.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0019.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0019.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=8 12-01-01-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -820,7 +1006,7 @@
 	<Value> $12-01-01-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=7 12-01-01-0005 
+	; button i=9 12-01-01-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -913,7 +1099,7 @@
 	<Value> $12-01-01-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=8 12-01-01-0006 
+	; button i=10 12-01-01-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1006,7 +1192,7 @@
 	<Value> $12-01-01-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=9 12-01-01-0007 
+	; button i=11 12-01-01-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1099,7 +1285,7 @@
 	<Value> $12-01-01-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=10 12-01-01-0009 
+	; button i=12 12-01-01-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1192,7 +1378,7 @@
 	<Value> $12-01-01-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-01-01-0010 
+	; button i=13 12-01-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1285,7 +1471,7 @@
 	<Value> $12-01-01-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=12 12-01-01-0011 
+	; button i=14 12-01-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1378,7 +1564,7 @@
 	<Value> $12-01-01-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-01-01-0012 
+	; button i=15 12-01-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1471,7 +1657,7 @@
 	<Value> $12-01-01-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-01-01-0017 
+	; button i=16 12-01-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1564,7 +1750,7 @@
 	<Value> $12-01-01-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-01-02-0018 
+	; button i=17 12-01-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1657,7 +1843,100 @@
 	<Value> $12-01-02-0018.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-11-02-0001 
+	; button i=18 12-01-02-0020 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0020.Button  </State> 
+	<Button>
+	<State> $12-01-02-0020.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0020.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0020.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0020.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0020.Self
+		Var NameDrink = $12-01-02-0020.NameE
+		Var NameDrinkTH = $12-01-02-0020.Name
+		Var DrinkDescriptionTH = $12-01-02-0020.description
+		Var DrinkDescription = $12-01-02-0020.descriptionE
+		Var PriceDrink = $12-01-02-0020.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0020.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-02-0020.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0020.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0020.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0020.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0020.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=19 12-11-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1750,7 +2029,7 @@
 	<Value> $12-11-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-01-02-0001 
+	; button i=20 12-01-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1843,7 +2122,7 @@
 	<Value> $12-01-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-01-02-0011 
+	; button i=21 12-01-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1936,7 +2215,100 @@
 	<Value> $12-01-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-01-02-0002 
+	; button i=22 12-01-02-0019 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0019.Button  </State> 
+	<Button>
+	<State> $12-01-02-0019.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0019.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0019.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0019.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0019.Self
+		Var NameDrink = $12-01-02-0019.NameE
+		Var NameDrinkTH = $12-01-02-0019.Name
+		Var DrinkDescriptionTH = $12-01-02-0019.description
+		Var DrinkDescription = $12-01-02-0019.descriptionE
+		Var PriceDrink = $12-01-02-0019.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0019.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-02-0019.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0019.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0019.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0019.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0019.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=23 12-01-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2029,7 +2401,7 @@
 	<Value> $12-01-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-11-02-0002 
+	; button i=24 12-11-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2122,7 +2494,7 @@
 	<Value> $12-11-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-01-02-0003 
+	; button i=25 12-01-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2215,7 +2587,7 @@
 	<Value> $12-01-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-01-02-0004 
+	; button i=26 12-01-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2308,7 +2680,7 @@
 	<Value> $12-01-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-01-02-0005 
+	; button i=27 12-01-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2401,7 +2773,7 @@
 	<Value> $12-01-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-01-02-0007 
+	; button i=28 12-01-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2494,7 +2866,7 @@
 	<Value> $12-01-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-01-02-0008 
+	; button i=29 12-01-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2587,7 +2959,7 @@
 	<Value> $12-01-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-01-02-0009 
+	; button i=30 12-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2680,7 +3052,7 @@
 	<Value> $12-01-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 12-01-02-0017 
+	; button i=31 12-01-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2773,7 +3145,7 @@
 	<Value> $12-01-02-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=28 11-01-02-0009 
+	; button i=32 11-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml
index 88ec3c2f..59b1d84f 100644
--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@@ -465,6 +465,21 @@
 			Refresh
 		EndIf
 
+		If TOPPING2 = "shot coffee 1007" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			If TOPPING3 = "Collagen" Then
+
+				Var ShowCollagenOnly = "Invisible"
+				Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png"
+				Var shot_h_layout = 310
+
+			EndIf
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
 ;-END
 		If TOPPING3 = "Collagen" Then
 			Var CollagenState = "Enable"
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 09b53694..75bbd15c 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -95,7 +95,7 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "5.54"
+	Var XMLPageVersion = "5.55"
 
 </EventOpen>