diff --git a/G1BILLETS.sh b/G1BILLETS.sh
index 1b72553..60f640d 100755
--- a/G1BILLETS.sh
+++ b/G1BILLETS.sh
@@ -58,6 +58,11 @@ do
     rm -f /tmp/secret.dunikey
     echo "$boucle : $BILLETPUBKEY"
 
+    ${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key "$SALT" "$SECRET"
+    ASTRONAUTENS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key)
+    rm -f ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key
+    ipfs key rm ${UNIQID} && echo "/ipns/$ASTRONAUTENS"
+
     # CREATION FICHIER IMAGE BILLET dans ${MY_PATH}/tmp/g1billet/${UNIQID}
     $(${MY_PATH}/MAKE_G1BILLET.sh "${SALT}" "${SECRET}" "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}" "${ASTRONAUTENS}" "${EMAIL}")
 
@@ -92,20 +97,13 @@ fi
 
 ###########################################################################
     ## ASTRO : FIND TW ADDRESS + EMAIL = CREATE PLAYER on 1234 API
-    if [[ "$STYLE" == "astro" ]]; then
 
-        ${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key "$SALT" "$SECRET"
-        ASTRONAUTENS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key)
-
-        rm -f ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key
-        ipfs key rm ${UNIQID} && echo "/ipns/$ASTRONAUTENS"
+    if [[ ${EMAIL} ]]; then
 
         UN=$(echo ${SALT} | jq -Rr @uri) ## URL ENCODED
         DE=$(echo ${SECRET} | jq -Rr @uri) ## URL ENCODED
-
-        [[ ${EMAIL} ]] \
-        && echo curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL \
-        && curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL
+        echo curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL
+        # && curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL
 
     fi
 ###########################################################################
diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh
index 934502d..ce90f56 100755
--- a/MAKE_G1BILLET.sh
+++ b/MAKE_G1BILLET.sh
@@ -26,6 +26,7 @@ EMAIL="$8"
 
 if [[ "$SALT" == "" || "$SECRET" == "" || "$MONTANT" == "" || "$NOTERIB" == "" || "$UNIQID" == "" ]]
 then
+    echo "ERROR MISSING PARAM"
     exit 1
 fi
 
@@ -64,36 +65,42 @@ esac
 # Add ${MY_PATH}/images/logo.png (250px)
 composite -compose Over -gravity SouthWest -geometry +50+50 -dissolve 70% "${MY_PATH}/images/logo${STYLE}.png" "${MY_PATH}/images/fond${STYLE}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
 
-
-if [[ $ASTRONAUTENS ]]; then
-    ## IT IS AN ASTRONAUTENS IPNS LINK
-    qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS"
-    composite -compose Over -gravity SouthEast -geometry +200+45 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
-else
-    # G1PUB QR CODE
-    qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB"
-    composite -compose Over -gravity SouthEast -geometry +35+50 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
-fi
-
-# Add g1 LOGO to Billet
-composite -compose Over -gravity NorthEast -geometry +50+25  -dissolve 90% "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png" "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
-
 # xbian style (ASTROPORT/KODI) + JEU
 if [[ "${STYLE}" == "xbian" || "${STYLE}" == "jeu" || "${STYLE}" == "astro" ]]
 then
+
+    if [[ $ASTRONAUTENS  ]]; then
+        ## IT IS AN ASTRONAUTENS IPNS LINK
+        MOK="TW."
+        qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png" "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS"
+        composite -compose Over -gravity SouthWest -geometry +40+45 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.TW.png" "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/${BILLETNAME}${MOK}.jpg"
+    else
+        MOK=""
+    fi
+
     # CREATE PSEUDO for Gchange.fr
     XZUID="$EMAIL"
     BOTTOM="ASTROPORT - IPFS TW - https://astroport.copylaradio.com"
+
 else
+
     XZUID="G1 BILLET"
     BOTTOM="Porte Monnaie Libre!!          https://gchange.fr         https://cesium.app"
+
 fi
 
+    # G1PUB QR CODE
+    qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB"
+    composite -compose Over -gravity SouthEast -geometry +35+50 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "${MY_PATH}/tmp/${BILLETNAME}${MOK}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
+
+# Add g1 LOGO to Billet
+composite -compose Over -gravity NorthEast -geometry +50+25  -dissolve 90% "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png" "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
+
 
 if [[ "$MONTANT" != "___" ]]; then
 convert -font 'Liberation-Sans' \
 -pointsize 40 -fill black -draw 'text 70,50 "'"$XZUID"'"' \
--pointsize 120 -fill black -draw 'text 325,250 "'"$MONTANT DU"'"' \
+-pointsize 120 -fill black -draw 'text 350,250 "'"$MONTANT"'"' \
 -pointsize 20 -fill black -draw 'text 380,20 "'"${NOTERIB}"'"' \
 -pointsize 30 -draw 'text 50,100 "'"Identifiant: $SALT"'"' \
 -pointsize 22 -fill black -draw 'text 50,130 "'"Code Secret:  $SECRET"'"' \