diff --git a/etc/atbapp/states/APP_States.xml b/etc/atbapp/states/APP_States.xml
index b00a237..3247ff5 100644
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ATB_APP_STATES version="1.1">
     <APP_STATE name="IDLE">
-        <EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
+        <EVENT name="BUTTON_START" resultingState="VEHICLE_SELECTION"/>
         <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
-        <EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="SETUP_DIRECT_COIN_INPUT"/>
+        <!-- <EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="SETUP_DIRECT_COIN_INPUT"/> -->
         <SCREEN name="START"/>
         <MODE name="IDLE"/>
     </APP_STATE>
@@ -21,16 +21,26 @@
                setPaymentType="CASH"/>
     </APP_STATE>
 
+    <!--
     <APP_STATE name="SETUP_SELL_STATE">
         <ENTRY_TASK name="TIMER" timeout="500"/>
         <EVENT name="TIMEOUT" resultingState="PARKTIME_SELECTION" setCashInputMode="PAY_DOWN" setProduct="SHORT_TERM_PARKING"/>
     </APP_STATE>
+    -->
     
     <APP_STATE name="LICENSEPLATE_INPUT">
         <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
         <EVENT name="BUTTON_NEXT" resultingState="PRODUCT_SELECTION"/>
         <SCREEN name="LICENSEPLATE_INPUT"/>
     </APP_STATE>
+    
+    <APP_STATE name="VEHICLE_SELECTION">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_VEHICLE_1" resultingState="PARKTIME_SELECTION" setCashInputMode="PAY_DOWN"   setProduct="SHORT_TERM_PARKING_CAR"/>
+        <EVENT name="BUTTON_VEHICLE_2" resultingState="PARKTIME_SELECTION" setCashInputMode="PAY_DOWN" setProduct="SHORT_TERM_PARKING_BUS"/>
+        <SCREEN name="VEHICLE_SELECTION"/>
+    </APP_STATE>   
+    
    <APP_STATE name="PRODUCT_SELECTION">
        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
        <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="SHORT_TERM_PARKING"/>
diff --git a/etc/atbapp/text/HMI_Texte.xml b/etc/atbapp/text/HMI_Texte.xml
index 4a5b29c..8494f27 100644
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
@@ -1116,11 +1116,11 @@
             <it_IT>AUTO</it_IT>
 		</Text>
         <Text textnr="0x32">
-            <de_AT>BUS / LKW</de_AT>
-            <en_GB>BUS / TRUCK</en_GB>
-            <fr_FR>BUS / CAMION</fr_FR>
-            <de_DE>BUS / LKW</de_DE>
-            <it_IT>BUS / AUTOCARRI</it_IT>
+            <de_AT>BUS</de_AT>
+            <en_GB>BUS</en_GB>
+            <fr_FR>BUS</fr_FR>
+            <de_DE>BUS</de_DE>
+            <it_IT>BUS</it_IT>
 		</Text>
         <Text textnr="0x33">
             <de_AT> </de_AT>