diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv
index 025aad50..b258fce4 100644
--- a/animation01/Menu Description - Sheet1.tsv	
+++ b/animation01/Menu Description - Sheet1.tsv	
@@ -109,7 +109,24 @@ HOT MATCHA LIMENADE	12-02-01-0012	1	8	9	12	16					24	1	1	32
 Energy drink 	12-05-02-0034	1	34	23							24	100	3:40	32
 Energy drink soda	12-05-02-0035	1	34	13	23						24	100	3:40	32
 Mango milk	12-03-02-0007	1	31	7	31	23					24	100	4:40	32
-														
+ENERGY DRINK PEPSI	12-05-02-0036	1	34	14	23						24	100	5:40	32
+ENERGY DRINK SODA	12-05-02-0035	1	34	13	23						24	100	6:40	32
+ENERGY DRINK LIMENADE	12-05-02-0037	1	34	12							24	100	7:40	32
+ICED ENERGY DRINK	12-05-02-0034	1	34	23							24	100	8:40	32
+ICED BLACK TEA	12-02-02-0005	1	23								24	100	9:40	32
+STRAWBERRY MILK	12-03-02-0007	1	23								24	100	10:40	32
+ICED LYCHEE LIMENADE SODA	12-05-02-0022	1	11	13	23						24	100	11:40	32
+iced strawlimenade soda	12-05-02-0023	1	19	13	23						24	100	12:40	32
+none	12-02-02-0013	1	12	13							24	100	13:40	32
+iced espresso L	12-01-02-0012	1	12	13							24	100	14:40	32
+iced cappu L	12-01-02-0013	1	12	13							24	100	15:40	32
+iced thai tea L	12-02-02-0015	1	12	13							24	100	16:40	32
+ICED LYCHEE	12-05-02-0032	1	11	16	23						24	100	17:40	32
+ICED LYCHEE SODA	12-05-02-0033	1	11	13	23						24	100	18:40	32
+HOT LYCHEE TEA	12-02-01-0019	1	11	16							24	100	19:40	32
+ICED LYCHEE TEA	12-02-02-0019	1	11	16	23						24	100	20:40	32
+HOT LYCHEE AMERICANO	12-01-01-0017	1	2	3	4	5	11	16			24	100	21:40	32
+ICED LYCHEE AMERICANO	12-01-02-0017	1	2	3	4	5	11	16	23		24	100	22:40	32
 														
 														
 														
diff --git a/campaign4/page_main.mp4 b/campaign4/page_main.mp4
new file mode 100755
index 00000000..dd868118
Binary files /dev/null and b/campaign4/page_main.mp4 differ
diff --git a/image/page_drink_select/bn_kuromitsu_coffee.png b/image/page_drink_select/bn_kuromitsu_coffee.png
new file mode 100644
index 00000000..a1111bc7
Binary files /dev/null and b/image/page_drink_select/bn_kuromitsu_coffee.png differ
diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv
index 6d8625ff..1fa2f5ab 100644
--- a/sheet/best_seller.tsv
+++ b/sheet/best_seller.tsv
@@ -1,4 +1,5 @@
 17/1/21	
+12-05-02-0029
 12-01-01-0001
 12-01-01-0003
 12-01-01-0004
diff --git a/xml/page_board.xml b/xml/page_board.xml
index eb1b2849..62dbf072 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -11,8 +11,7 @@
 	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
 	Var FileNumber = 1
 
-	Var taobin_version = "1.45"
-	; 1.00 is 
+	Var taobin_version = "1.47"
 
 	; On open
 	Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -152,7 +151,11 @@
 	; Default
 	Var video_main_0 = "/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv1.mp4"
 	Var video_main_1 = "/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv3.mp4"
-	Var video_main_count = 2
+	Var video_main_2 = "/mnt/sdcard/coffeevending/taobin_project/campaign2/page_main.mp4"
+	Var video_main_3 = "/mnt/sdcard/coffeevending/taobin_project/campaign3/page_main.mp4"
+	Var video_main_4 = "/mnt/sdcard/coffeevending/taobin_project/campaign4/page_main.mp4"
+	Var video_main_count = 5
+
 
 	Var video_menu_1 = "ROOT/taobin_project/video/taobin_adv2_1.mp4"
 	Var video_menu_0 = "ROOT/taobin_project/video/taobin_adv2.mp4"
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index 00e24ffe..63ab1b29 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -44,6 +44,7 @@
 	Var StrawAutoRelease1 = "false"
 	Var StrawAutoRelease2 = "false"
 
+	Machine DoorClose
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index d5724498..0547d76b 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -25,6 +25,7 @@
  product_code.append('12-01-01-0010')
  product_code.append('12-01-01-0011')
  product_code.append('12-01-01-0012')
+ product_code.append('12-01-01-0017')
 
  product_code.append('12-11-02-0001')
  product_code.append('12-01-02-0001')
@@ -40,6 +41,8 @@
  product_code.append('12-01-02-0007')
  product_code.append('12-01-02-0008')
  product_code.append('12-01-02-0009')
+ product_code.append('12-01-02-0017')
+ 
  product_code.append('11-01-02-0009')
  #product_code.append('')
 
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index 2b3c1c32..6d652e34 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -1471,7 +1471,100 @@
 	<Value> $12-01-01-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-11-02-0001 
+	; button i=14 12-01-01-0017 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0017.Button  </State> 
+	<Button>
+	<State> $12-01-01-0017.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0017.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0017.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0017.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0017.Self
+		Var NameDrink = $12-01-01-0017.NameE
+		Var NameDrinkTH = $12-01-01-0017.Name
+		Var DrinkDescriptionTH = $12-01-01-0017.description
+		Var DrinkDescription = $12-01-01-0017.descriptionE
+		Var PriceDrink = $12-01-01-0017.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0017.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-0017.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-0017.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-0017.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-0017.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-0017.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=15 12-11-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1564,7 +1657,7 @@
 	<Value> $12-11-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-01-02-0001 
+	; button i=16 12-01-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1657,7 +1750,7 @@
 	<Value> $12-01-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-01-02-0011 
+	; button i=17 12-01-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1750,7 +1843,7 @@
 	<Value> $12-01-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-01-02-0002 
+	; button i=18 12-01-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1843,7 +1936,7 @@
 	<Value> $12-01-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-11-02-0002 
+	; button i=19 12-11-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1936,7 +2029,7 @@
 	<Value> $12-11-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-01-02-0003 
+	; button i=20 12-01-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2029,7 +2122,7 @@
 	<Value> $12-01-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-01-02-0004 
+	; button i=21 12-01-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2122,7 +2215,7 @@
 	<Value> $12-01-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-01-02-0005 
+	; button i=22 12-01-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2215,7 +2308,7 @@
 	<Value> $12-01-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-01-02-0007 
+	; button i=23 12-01-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2308,7 +2401,7 @@
 	<Value> $12-01-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-01-02-0008 
+	; button i=24 12-01-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2401,7 +2494,7 @@
 	<Value> $12-01-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-01-02-0009 
+	; button i=25 12-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2494,7 +2587,100 @@
 	<Value> $12-01-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 11-01-02-0009 
+	; button i=26 12-01-02-0017 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0017.Button  </State> 
+	<Button>
+	<State> $12-01-02-0017.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0017.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0017.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0017.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0017.Self
+		Var NameDrink = $12-01-02-0017.NameE
+		Var NameDrinkTH = $12-01-02-0017.Name
+		Var DrinkDescriptionTH = $12-01-02-0017.description
+		Var DrinkDescription = $12-01-02-0017.descriptionE
+		Var PriceDrink = $12-01-02-0017.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0017.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-0017.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-0017.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-0017.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-0017.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-0017.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=27 11-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml
index 1774fb87..cdeb82d3 100644
--- a/xml/page_catalog_choose_drink3.pml
+++ b/xml/page_catalog_choose_drink3.pml
@@ -17,6 +17,7 @@
  
  product_code.append('12-02-01-0007')
  product_code.append('12-02-01-0008')
+ product_code.append('12-02-01-0019')
  product_code.append('12-02-01-0009')
  product_code.append('12-02-01-0010')
  product_code.append('12-02-01-0011')
@@ -32,11 +33,12 @@
  product_code.append('12-02-02-0007')
 
  product_code.append('12-02-02-0008')
+ product_code.append('12-02-02-0019')
  product_code.append('12-02-02-0009')
  product_code.append('12-02-02-0010')
  product_code.append('12-02-02-0011')
  product_code.append('12-02-02-0012')
- product_code.append('12-02-02-0018')
+ product_code.append('12-05-02-0027')
 
  menu_count = len( product_code)
 ?>
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index e9d74b6d..1c61942a 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -912,7 +912,100 @@
 	<Value> $12-02-01-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=8 12-02-01-0009 
+	; button i=8 12-02-01-0019 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-01-0019.Button  </State> 
+	<Button>
+	<State> $12-02-01-0019.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-01-0019.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-01-0019.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-01-0019.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-01-0019.Self
+		Var NameDrink = $12-02-01-0019.NameE
+		Var NameDrinkTH = $12-02-01-0019.Name
+		Var DrinkDescriptionTH = $12-02-01-0019.description
+		Var DrinkDescription = $12-02-01-0019.descriptionE
+		Var PriceDrink = $12-02-01-0019.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-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-02-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-02-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-02-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-02-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-02-01-0019.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=9 12-02-01-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1005,7 +1098,7 @@
 	<Value> $12-02-01-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=9 12-02-01-0010 
+	; button i=10 12-02-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1098,7 +1191,7 @@
 	<Value> $12-02-01-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=10 12-02-01-0011 
+	; button i=11 12-02-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1191,7 +1284,7 @@
 	<Value> $12-02-01-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-02-01-0012 
+	; button i=12 12-02-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1284,7 +1377,7 @@
 	<Value> $12-02-01-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=12 12-02-01-0017 
+	; button i=13 12-02-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1377,7 +1470,7 @@
 	<Value> $12-02-01-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-02-02-0001 
+	; button i=14 12-02-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1470,7 +1563,7 @@
 	<Value> $12-02-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-02-02-0002 
+	; button i=15 12-02-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1563,7 +1656,7 @@
 	<Value> $12-02-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-02-02-0003 
+	; button i=16 12-02-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1656,7 +1749,7 @@
 	<Value> $12-02-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-02-02-0004 
+	; button i=17 12-02-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1749,7 +1842,7 @@
 	<Value> $12-02-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-02-02-0005 
+	; button i=18 12-02-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1842,7 +1935,7 @@
 	<Value> $12-02-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-02-02-0006 
+	; button i=19 12-02-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1935,7 +2028,7 @@
 	<Value> $12-02-02-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-02-02-0007 
+	; button i=20 12-02-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2028,7 +2121,7 @@
 	<Value> $12-02-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-02-02-0008 
+	; button i=21 12-02-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2121,7 +2214,100 @@
 	<Value> $12-02-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-02-02-0009 
+	; button i=22 12-02-02-0019 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-02-0019.Button  </State> 
+	<Button>
+	<State> $12-02-02-0019.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-02-0019.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-02-0019.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-02-0019.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-02-0019.Self
+		Var NameDrink = $12-02-02-0019.NameE
+		Var NameDrinkTH = $12-02-02-0019.Name
+		Var DrinkDescriptionTH = $12-02-02-0019.description
+		Var DrinkDescription = $12-02-02-0019.descriptionE
+		Var PriceDrink = $12-02-02-0019.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-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-02-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-02-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-02-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-02-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-02-02-0019.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=23 12-02-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2214,7 +2400,7 @@
 	<Value> $12-02-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-02-02-0010 
+	; button i=24 12-02-02-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2307,7 +2493,7 @@
 	<Value> $12-02-02-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-02-02-0011 
+	; button i=25 12-02-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2400,7 +2586,7 @@
 	<Value> $12-02-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-02-02-0012 
+	; button i=26 12-02-02-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2493,28 +2679,28 @@
 	<Value> $12-02-02-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-02-02-0018 
+	; button i=27 12-05-02-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> $12-02-02-0018.Button  </State> 
+	<State> $12-05-02-0027.Button  </State> 
 	<Button>
-	<State> $12-02-02-0018.Button  </State> 
-	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-02-0018.image ) </Filename>
-	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-02-0018.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-02-0018.image ) " </FilenameDisable>
+	<State> $12-05-02-0027.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0027.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0027.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0027.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var SelectDrink = $12-02-02-0018.Self
-		Var NameDrink = $12-02-02-0018.NameE
-		Var NameDrinkTH = $12-02-02-0018.Name
-		Var DrinkDescriptionTH = $12-02-02-0018.description
-		Var DrinkDescription = $12-02-02-0018.descriptionE
-		Var PriceDrink = $12-02-02-0018.Price
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-02-0018.image
+		Var SelectDrink = $12-05-02-0027.Self
+		Var NameDrink = $12-05-02-0027.NameE
+		Var NameDrinkTH = $12-05-02-0027.Name
+		Var DrinkDescriptionTH = $12-05-02-0027.description
+		Var DrinkDescription = $12-05-02-0027.descriptionE
+		Var PriceDrink = $12-05-02-0027.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0027.image
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
@@ -2531,7 +2717,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $12-02-02-0018.Price </Value>
+	<Value> $12-05-02-0027.Price </Value>
 	</Text>
 	<Text>
 	<X> 164 </X>
@@ -2552,7 +2738,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $12-02-02-0018.Name </Value>
+	<Value> $12-05-02-0027.Name </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2562,7 +2748,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $12-02-02-0018.description </Value>
+	<Value> $12-05-02-0027.description </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2573,7 +2759,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $12-02-02-0018.NameE </Value>
+	<Value> $12-05-02-0027.NameE </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2583,7 +2769,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $12-02-02-0018.descriptionE </Value>
+	<Value> $12-05-02-0027.descriptionE </Value>
 	</Text>
 </Block>
 </FrameScroll>
diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml
index 998fb8f8..1d40d083 100644
--- a/xml/page_catalog_choose_drink6.pml
+++ b/xml/page_catalog_choose_drink6.pml
@@ -12,6 +12,7 @@
  product_code.append('12-05-02-0035')
  product_code.append('12-05-02-0010')
  product_code.append('12-05-02-0011')
+ product_code.append('12-05-02-0033')
 
  product_code.append('12-05-02-0028') 
 
@@ -34,6 +35,7 @@
  product_code.append('12-05-02-0034')
  
  product_code.append('12-05-02-0004')
+ product_code.append('12-05-02-0032')
  product_code.append('12-05-02-0005')
 
  product_code.append('12-05-02-0006')
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index 89b7c798..ef09f4f7 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -821,7 +821,100 @@
 	<Value> $12-05-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=7 12-05-02-0028 
+	; button i=7 12-05-02-0033 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0033.Button  </State> 
+	<Button>
+	<State> $12-05-02-0033.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0033.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0033.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0033.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0033.Self
+		Var NameDrink = $12-05-02-0033.NameE
+		Var NameDrinkTH = $12-05-02-0033.Name
+		Var DrinkDescriptionTH = $12-05-02-0033.description
+		Var DrinkDescription = $12-05-02-0033.descriptionE
+		Var PriceDrink = $12-05-02-0033.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0033.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-05-02-0033.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-05-02-0033.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-05-02-0033.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-05-02-0033.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-05-02-0033.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=8 12-05-02-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -914,7 +1007,7 @@
 	<Value> $12-05-02-0028.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=8 12-05-02-0012 
+	; button i=9 12-05-02-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1007,7 +1100,7 @@
 	<Value> $12-05-02-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=9 12-05-02-0013 
+	; button i=10 12-05-02-0013 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1100,7 +1193,7 @@
 	<Value> $12-05-02-0013.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=10 12-05-02-0025 
+	; button i=11 12-05-02-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1193,7 +1286,7 @@
 	<Value> $12-05-02-0025.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-05-02-0031 
+	; button i=12 12-05-02-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1286,7 +1379,7 @@
 	<Value> $12-05-02-0031.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=12 12-05-02-0008 
+	; button i=13 12-05-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1379,7 +1472,7 @@
 	<Value> $12-05-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-05-02-0009 
+	; button i=14 12-05-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1472,7 +1565,7 @@
 	<Value> $12-05-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-05-02-0024 
+	; button i=15 12-05-02-0024 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1565,7 +1658,7 @@
 	<Value> $12-05-02-0024.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-05-02-0029 
+	; button i=16 12-05-02-0029 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1658,7 +1751,7 @@
 	<Value> $12-05-02-0029.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-05-02-0014 
+	; button i=17 12-05-02-0014 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1751,7 +1844,7 @@
 	<Value> $12-05-02-0014.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-05-02-0015 
+	; button i=18 12-05-02-0015 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1844,7 +1937,7 @@
 	<Value> $12-05-02-0015.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-05-01-0001 
+	; button i=19 12-05-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1937,7 +2030,7 @@
 	<Value> $12-05-01-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-05-02-0001 
+	; button i=20 12-05-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2030,7 +2123,7 @@
 	<Value> $12-05-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-05-02-0034 
+	; button i=21 12-05-02-0034 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2123,7 +2216,7 @@
 	<Value> $12-05-02-0034.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-05-02-0004 
+	; button i=22 12-05-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2216,7 +2309,100 @@
 	<Value> $12-05-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-05-02-0005 
+	; button i=23 12-05-02-0032 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-05-02-0032.Button  </State> 
+	<Button>
+	<State> $12-05-02-0032.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-05-02-0032.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-05-02-0032.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-05-02-0032.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-05-02-0032.Self
+		Var NameDrink = $12-05-02-0032.NameE
+		Var NameDrinkTH = $12-05-02-0032.Name
+		Var DrinkDescriptionTH = $12-05-02-0032.description
+		Var DrinkDescription = $12-05-02-0032.descriptionE
+		Var PriceDrink = $12-05-02-0032.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-05-02-0032.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-05-02-0032.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-05-02-0032.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-05-02-0032.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-05-02-0032.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-05-02-0032.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=24 12-05-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2309,7 +2495,7 @@
 	<Value> $12-05-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-05-02-0006 
+	; button i=25 12-05-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2402,7 +2588,7 @@
 	<Value> $12-05-02-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-05-02-0026 
+	; button i=26 12-05-02-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2495,7 +2681,7 @@
 	<Value> $12-05-02-0026.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-05-02-0030 
+	; button i=27 12-05-02-0030 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2588,7 +2774,7 @@
 	<Value> $12-05-02-0030.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-05-02-0002 
+	; button i=28 12-05-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2681,7 +2867,7 @@
 	<Value> $12-05-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 12-05-02-0003 
+	; button i=29 12-05-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2774,7 +2960,7 @@
 	<Value> $12-05-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=28 12-05-02-0016 
+	; button i=30 12-05-02-0016 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2867,7 +3053,7 @@
 	<Value> $12-05-02-0016.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=29 12-05-02-0017 
+	; button i=31 12-05-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2960,7 +3146,7 @@
 	<Value> $12-05-02-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=30 12-05-02-0018 
+	; button i=32 12-05-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3053,7 +3239,7 @@
 	<Value> $12-05-02-0018.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=31 12-05-01-0002 
+	; button i=33 12-05-01-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml
index 5348be53..38fd86e7 100644
--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@@ -67,8 +67,8 @@
 
 	EndIf
 
-
-	Machine DoorClose
+	; Move to catalog.
+	;Machine DoorClose
 	
 	
 
diff --git a/xml/test_video_loop.xml b/xml/test_video_loop.xml
index a80f879f..7d41bb9f 100644
--- a/xml/test_video_loop.xml
+++ b/xml/test_video_loop.xml
@@ -25,6 +25,18 @@
 	EndIf
 
 
+	If VideoAdvIndex = 4 Then
+		Var HeadVideoFilename = video_main_3
+		DEBUGVAR video_main_3
+	EndIf
+
+
+	If VideoAdvIndex = 5 Then
+		Var HeadVideoFilename = video_main_4
+		DEBUGVAR video_main_4
+	EndIf
+
+
 	DEBUGVAR VideoAdvIndex
 	DEBUGVAR video_main_count