diff --git a/scripts/geoloc-members-json.sh b/scripts/geoloc-members-json.sh
index 0f28f0f..48a58d4 100755
--- a/scripts/geoloc-members-json.sh
+++ b/scripts/geoloc-members-json.sh
@@ -5,39 +5,36 @@ GPATH="$( cd "$(dirname "$0")" ; pwd -P )/.."
 [[ ! -f $GPATH/.env ]] && cp $GPATH/.env.example $GPATH/.env
 source $GPATH/.env
 
-SOURCE_MBR="https://g1-stats.axiom-team.fr/data/wallets-g1-membres.txt"
-SOURCE_LARF="https://g1-stats.axiom-team.fr/data/wallets-g1-simple.txt"
 FILE="/tmp/geoloc-members.json"
 FINAL_LOCATION="$WEBPATH/data/geoloc-members.json"
 
-if [[ -f /home/axiom/apps/g1-stats/data/wallets-g1-membres.txt ]]; then
-    DATA_MBR=$(cat /home/axiom/apps/g1-stats/data/wallets-g1-membres.txt)
-else
-    DATA_MBR=$(curl -s $SOURCE_MBR)
-fi
+DATA_MBR=$($JAKLIS listWallets --brut --mbr)
+DATA_LARF=$($JAKLIS listWallets --brut --non_mbr)
+DATA_LARF+=$($JAKLIS listWallets --brut --larf)
 
-if [[ -f /home/axiom/apps/g1-stats/data/wallets-g1-simple.txt ]]; then
-    DATA_LARF=$(cat /home/axiom/apps/g1-stats/data/wallets-g1-simple.txt)
-else
-    DATA_LARF=$(curl -s $SOURCE_LARF)
-fi
+echo "$DATA_LARF" > /tmp/tatata
 
 echo "[" > $FILE
 
+oldIFS=$IFS;
+IFS=$'\n';
 for i in $DATA_MBR; do
-    result=$($JAKLIS get -p $i)
+    IFS=$oldIFS
+    pubkey=$(echo $i | awk '{ print $1 }')
+    userId=\"$(echo $i | awk '{ print $2 }')\"
+    result=$($JAKLIS get -p $pubkey)
     geoPoint=$(echo "$result" | jq .geoPoint 2>/dev/null)
 
     if [[ "$geoPoint" == "null" || "$result" == "Profile vide" ]]; then
         continue
     else
         isMbr='"isMember": true,'
-        userId=$($JAKLIS id -p $i | jq .idty.username)
         userIdFormat="\"userId\": $userId,"
         resultWithMbr=$(echo "$result" | sed "s/\"geoPoint\": {/$userIdFormat $isMbr  \"geoPoint\": {/g")
         echo "$resultWithMbr," >> $FILE
     fi
 done
+IFS=$oldIFS
 
 for i in $DATA_LARF; do
     result=$($JAKLIS get -p $i)