diff --git a/API/PLAYER.sh b/API/PLAYER.sh
index 5feea985..7249aa4a 100755
--- a/API/PLAYER.sh
+++ b/API/PLAYER.sh
@@ -39,21 +39,25 @@ PORT=$1 PLAYER=$2 APPNAME=$3 WHAT=$4 OBJ=$5 VAL=$6
             if [[ $WHAT =~ ^[0-9]+$ ]]; then
 
                 echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${WHAT} -p ${VAL} -c 'Bro' -m"
+                ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \
                 ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http
 
             fi
 
             if [[ "$WHAT" == "history" ]]; then
                 sed -i "s~text/html~application/json~g"  ~/.zen/tmp/$PLAYER.pay.$WHAT.http
+                ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \
                 ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -j >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http
             fi
 
             if [[ "$WHAT" == "get" ]]; then
                 sed -i "s~text/html~application/json~g"  ~/.zen/tmp/$PLAYER.pay.$WHAT.http
+                ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \
                 ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey get >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http
             fi
 
             if [[ "$WHAT" == "balance" ]]; then
+                    ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \
                     ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey balance >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http
             fi
 
@@ -72,13 +76,17 @@ PORT=$1 PLAYER=$2 APPNAME=$3 WHAT=$4 OBJ=$5 VAL=$6
                 [[ ! $VAL ]] && VAL="G1CopierYoutube"
                 echo "EXPORT MOATUBE $PLAYER $VAL"
 
-                echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}.$PLAYER.http
-                sed -i "s~text/html~application/json~g"  ~/.zen/tmp/${MOATS}.$PLAYER.http
-
                 tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp/ --render '.' "$PLAYER.moatube.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "[tag[$VAL]]"
 
-                cat ~/.zen/tmp/$PLAYER.moatube.json >> ~/.zen/tmp/${MOATS}.$PLAYER.http
-                cat ~/.zen/tmp/${MOATS}.$PLAYER.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
+                if [[ ! $WHAT || $WHAT == "json" ]]; then
+
+                    echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}.$PLAYER.http
+                    sed -i "s~text/html~application/json~g"  ~/.zen/tmp/${MOATS}.$PLAYER.http
+                    cat ~/.zen/tmp/$PLAYER.moatube.json >> ~/.zen/tmp/${MOATS}.$PLAYER.http
+                    cat ~/.zen/tmp/${MOATS}.$PLAYER.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
+
+                fi
+
                 end=`date +%s`
                 echo "(TW) MOA Operation time was "`expr $end - $start` seconds.
                 exit 0
diff --git a/API/SALT.sh b/API/SALT.sh
index 1ce0d076..bce13e45 100755
--- a/API/SALT.sh
+++ b/API/SALT.sh
@@ -58,9 +58,9 @@ PEPPER=$THIS
 
     # Get PLAYER wallet amount
     ( ## SUB PROCESS
-        COINS=$(${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key balance)
+        COINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 20 ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key balance)
         echo "+++ WALLET BALANCE _ $COINS (G1) _"
-        [[ $COINS == "" || $COINS == "null" ]] && ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key send -d "${G1PUB}" -t "BRO" -m "0 G1 (ᵔ◡◡ᵔ) FLASH TON G1VISA"
+        [[ $COINS == "" || $COINS == "null" ]] && ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key send -d "${G1PUB}" -t "BRO" -m "0 G1 (ᵔ◡◡ᵔ) FLASH TON G1VISA"
         end=`date +%s`
         echo "G1WALLET  (☓‿‿☓) Execution time was "`expr $end - $start` seconds.
     ) &