diff --git a/faction/management/commands/updateFactions.py b/faction/management/commands/updateFactions.py
index 07b5b251c..19ebf2ed5 100644
--- a/faction/management/commands/updateFactions.py
+++ b/faction/management/commands/updateFactions.py
@@ -32,10 +32,17 @@ def handle(self, **options):
         for faction in Faction.objects.filter(nKeys__gt=0):
             print("[command.faction.update] faction {}".format(faction))
             try:
-                faction.updateLog()
-                faction.updateUpgrades()
-                # faction.resetSimuUpgrades(update=True)
-                # faction.getFactionTree()
+                print("[command.faction.update] faction {}: check keys".format(faction))
+                faction.checkKeys()
+                if faction.nKeys > 0:
+                    print("[command.faction.update] faction {}: update logs".format(faction))
+                    faction.updateLog()
+                    print("[command.faction.update] faction {}: update upgrades".format(faction))
+                    faction.updateUpgrades()
+                    # faction.resetSimuUpgrades(update=True)
+                    # faction.getFactionTree()
+                else:
+                    print("[command.faction.update] faction {}: no more keys".format(faction))
             except BaseException as e:
                 print("[command.faction.update] {}".format(e))
 
diff --git a/faction/models.py b/faction/models.py
index 138a9af51..9917747c0 100644
--- a/faction/models.py
+++ b/faction/models.py
@@ -179,6 +179,36 @@ def getKeys(self, ignored=False):
         else:
             return {k.player.tId: k.value for k in self.masterKeys.filter(useFact=True)}
 
+    def checkKeys(self):
+        masterKeys = self.masterKeys.all()
+
+        for key in masterKeys:
+            # check currency for AA perm (smallest payload and give )
+            req = apiCall("faction", "", "currency", key.value, verbose=False)
+
+            if 'apiError' in req:
+                code = req['apiErrorCode']
+                if code in [1, 2, 10]:
+                    # delete key
+                    print("{} delete {} (API error {})".format(self, key, code))
+                    key.delete()
+                elif code in [7]:
+                    # remove key
+                    print("{} remove {} (API error {})".format(self, key, code))
+                    self.masterKeys.remove(key)
+
+            elif req['faction_id'] != self.tId:
+                # remove key
+                print("{} remove {} (changed faction)".format(self, key))
+                self.masterKeys.remove(key)
+
+            key.lastPulled = tsnow()
+            key.reason = "Check AA perm"
+            key.save()
+
+        self.nKeys = len(self.getKeys())
+        self.save()
+
     def updateMembers(self, key=None, force=True, indRefresh=False):
         # it's not possible to delete all memebers and recreate the base
         # otherwise the target list will be lost
diff --git a/faction/views.py b/faction/views.py
index ca4d8d225..4670f30bf 100644
--- a/faction/views.py
+++ b/faction/views.py
@@ -75,37 +75,36 @@ def configurations(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             # get faction
             faction = Faction.objects.filter(tId=factionId).first()
             if faction is None:
                 return render(request, 'yata/error.html', {'errorMessage': 'Faction {} not found in the database.'.format(factionId)})
 
-            if player.factionAA:
-                faction.manageKey(player)
+            faction.manageKey(player)
 
-                # update members before to avoid coming here before having members
-                faction.updateMembers(key=player.getKey(value=False), force=False)
+            # update members before to avoid coming here before having members
+            faction.updateMembers(key=player.getKey(value=False), force=False)
 
-                # get keys
-                keys = faction.masterKeys.filter(useSelf=True)
-                faction.nKeys = len(keys.filter(useFact=True))
-                faction.save()
-
-                context = {'player': player, 'factioncat': True, "bonus": BONUS_HITS, "faction": faction, 'keys': keys, 'view': {'aa': True}}
+            # get keys
+            keys = faction.masterKeys.filter(useSelf=True)
+            faction.nKeys = len(keys.filter(useFact=True))
+            faction.save()
 
-                # add poster
-                if faction.poster:
-                    fntId = {i: [f.split("__")[0].replace("-", " "), int(f.split("__")[1].split(".")[0])] for i, f in enumerate(sorted(os.listdir(settings.STATIC_ROOT + '/perso/font/')))}
-                    posterOpt = json.loads(faction.posterOpt)
-                    context['posterOpt'] = posterOpt
-                    context['random'] = random.randint(0, 65535)
-                    context['fonts'] = fntId
+            context = {'player': player, 'factioncat': True, "bonus": BONUS_HITS, "faction": faction, 'keys': keys, 'view': {'aa': True}}
 
-                page = 'faction/content-reload.html' if request.method == 'POST' else 'faction.html'
-                return render(request, page, context)
+            # add poster
+            if faction.poster:
+                fntId = {i: [f.split("__")[0].replace("-", " "), int(f.split("__")[1].split(".")[0])] for i, f in enumerate(sorted(os.listdir(settings.STATIC_ROOT + '/perso/font/')))}
+                posterOpt = json.loads(faction.posterOpt)
+                context['posterOpt'] = posterOpt
+                context['random'] = random.randint(0, 65535)
+                context['fonts'] = fntId
 
-            else:
-                return returnError(type=403, msg="You need AA rights.")
+            page = 'faction/content-reload.html' if request.method == 'POST' else 'faction.html'
+            return render(request, page, context)
 
         else:
             return returnError(type=403, msg="You might want to log in.")
@@ -118,6 +117,10 @@ def configurationsKey(request):
     try:
         if request.session.get('player') and request.method == 'POST':
             player = getPlayer(request.session["player"].get("tId"))
+
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             key = player.key_set.first()
             key.useFact = not key.useFact
             key.save()
@@ -139,6 +142,9 @@ def configurationsThreshold(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             # get faction
             faction = Faction.objects.filter(tId=factionId).first()
             if faction is None:
@@ -165,6 +171,9 @@ def configurationsPoster(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             # get faction
             faction = Faction.objects.filter(tId=factionId).first()
             if faction is None:
@@ -181,7 +190,6 @@ def configurationsPoster(request):
             # update poster
             if request.method == "POST" and request.POST.get("posterConf"):
                 updatePosterConf(faction, request.POST.dict())
-                updatePoster(faction)
 
             faction.save()
 
@@ -195,6 +203,7 @@ def configurationsPoster(request):
                 context['posterOpt'] = posterOpt
                 context['random'] = random.randint(0, 65535)
                 context['fonts'] = fntId
+                updatePoster(faction)
             elif not faction.poster and os.path.exists(url):
                 os.remove(url)
                 context['posterDeleted'] = True
@@ -460,6 +469,9 @@ def manageReport(request):
             factionId = player.factionId
             context = {"player": player}
 
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             # get faction
             chainId = request.POST.get("chainId", -1)
             faction = Faction.objects.filter(tId=factionId).first()
@@ -882,45 +894,45 @@ def manageWall(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
-            if player.factionAA:
-                faction = Faction.objects.filter(tId=factionId).first()
-                if faction is None:
-                    return render(request, 'yata/error.html', {'inlineError': 'Faction {} not found in the database.'.format(factionId)})
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
 
-                wallId = request.POST.get("wallId", 0)
-                wall = Wall.objects.filter(tId=wallId).first()
-                if wall is None:
-                    return render(request, 'yata/error.html', {'inlineError': 'Wall {} not found in the database.'.format(wallId)})
+            faction = Faction.objects.filter(tId=factionId).first()
+            if faction is None:
+                return render(request, 'yata/error.html', {'inlineError': 'Faction {} not found in the database.'.format(factionId)})
 
-                elif request.POST.get("type") == "delete":
-                    wall.attacksreport_set.filter(faction=faction).delete()
-                    wall.factions.remove(faction)
-                    if not len(wall.factions.all()):
-                        wall.delete()
-                    return render(request, 'faction/walls/buttons.html')
+            wallId = request.POST.get("wallId", 0)
+            wall = Wall.objects.filter(tId=wallId).first()
+            if wall is None:
+                return render(request, 'yata/error.html', {'inlineError': 'Wall {} not found in the database.'.format(wallId)})
 
-                elif request.POST.get("type") == "toggle":
+            elif request.POST.get("type") == "delete":
+                wall.attacksreport_set.filter(faction=faction).delete()
+                wall.factions.remove(faction)
+                if not len(wall.factions.all()):
+                    wall.delete()
+                return render(request, 'faction/walls/buttons.html')
 
-                    breakdown = json.loads(wall.breakdown)
+            elif request.POST.get("type") == "toggle":
 
-                    if str(faction.tId) in breakdown:
-                        # the wall was on we turn it off
-                        breakdown = [id for id in breakdown if id != str(faction.tId)]
-                        wall.breakSingleFaction = False
-                    else:
-                        # the wall was off we turn it on
-                        breakdown.append(str(faction.tId))
-                        wall.breakSingleFaction = True
+                breakdown = json.loads(wall.breakdown)
 
-                    wall.breakdown = json.dumps(breakdown)
+                if str(faction.tId) in breakdown:
+                    # the wall was on we turn it off
+                    breakdown = [id for id in breakdown if id != str(faction.tId)]
+                    wall.breakSingleFaction = False
+                else:
+                    # the wall was off we turn it on
+                    breakdown.append(str(faction.tId))
+                    wall.breakSingleFaction = True
 
-                wall.save()
-                wall.report = wall.getReport(faction)
+                wall.breakdown = json.dumps(breakdown)
 
-                context = {"player": player, "wall": wall}
-                return render(request, 'faction/walls/buttons.html', context)
-            else:
-                return returnError(type=403, msg="You need AA rights.")
+            wall.save()
+            wall.report = wall.getReport(faction)
+
+            context = {"player": player, "wall": wall}
+            return render(request, 'faction/walls/buttons.html', context)
 
         else:
             message = "You might want to log in." if request.method == "POST" else "You need to post. Don\'t try to be a smart ass."
@@ -1145,6 +1157,9 @@ def manageAttacks(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             page = 'faction/content-reload.html' if request.method == 'POST' else 'faction.html'
 
             # get faction
@@ -1199,6 +1214,10 @@ def attacksReport(request, reportId):
 
             # if modify end date
             if 'modifyEnd' in request.POST:
+
+                if not player.factionAA:
+                    return returnError(type=403, msg="You need AA rights.")
+
                 tse = int(request.POST.get("end", 0))
                 if report.start < tse:
                     report.end = tse
@@ -1382,6 +1401,9 @@ def manageRevives(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             page = 'faction/content-reload.html' if request.method == 'POST' else 'faction.html'
 
             # get faction
@@ -1426,7 +1448,6 @@ def revivesReport(request, reportId):
 
             # get breakdown
             report = faction.revivesreport_set.filter(pk=reportId).first()
-            print(report)
             if report is None:
                 context = dict({"player": player,
                                 'chaincat': True,
@@ -1778,7 +1799,7 @@ def bigBrother(request):
                 # select first timestamp
                 stat = allContributors.filter(stat=name, timestamp=tsA).first()
                 contributors = dict({})
-                # in case they remove stat and select it before refraising
+                # in case they remove stat and select it before refresh
                 if stat is not None:
                     comparison[3] = BB_BRIDGE.get(stat.stat, stat.stat)
                     for k, v in json.loads(stat.contributors).items():
@@ -1799,6 +1820,11 @@ def bigBrother(request):
                             if not c[2] - c[1]:
                                 del contributors[memberName]
 
+                    # delete contributors out of faction for ts2
+                    todel = [k for k, v in contributors.items() if not v[2]]
+                    for tId in todel:
+                        del contributors[tId]
+
             context = {'player': player, 'factioncat': True, 'faction': faction, 'statsList': statsList, 'contributors': contributors, 'comparison': comparison, 'bridge': BB_BRIDGE, 'view': {'bb': True}}
 
             if message:
@@ -1826,24 +1852,23 @@ def removeContributors(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
-            if player.factionAA:
-                faction = Faction.objects.filter(tId=factionId).first()
-                if faction is None:
-                    return render(request, 'yata/error.html', {'errorMessage': 'Faction {} not found in the database.'.format(factionId)})
-                print('[view.chain.removeUpgrade] faction {} found'.format(factionId))
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
 
-                s = faction.contributors_set.filter(stat=request.POST.get('name')).filter(timestamp=request.POST.get('ts')).first()
-                try:
-                    s.delete()
-                    m = "Okay"
-                    t = 1
-                except BaseException as e:
-                    m = str(e)
-                    t = -1
+            faction = Faction.objects.filter(tId=factionId).first()
+            if faction is None:
+                return render(request, 'yata/error.html', {'errorMessage': 'Faction {} not found in the database.'.format(factionId)})
 
-                return HttpResponse(json.dumps({"message": m, "type": t}), content_type="application/json")
-            else:
-                return returnError(type=403, msg="You need AA rights.")
+            s = faction.contributors_set.filter(stat=request.POST.get('name')).filter(timestamp=request.POST.get('ts')).first()
+            try:
+                s.delete()
+                m = "Okay"
+                t = 1
+            except BaseException as e:
+                m = str(e)
+                t = -1
+
+            return HttpResponse(json.dumps({"message": m, "type": t}), content_type="application/json")
 
         else:
             message = "You might want to log in." if request.method == "POST" else "You need to post. Don\'t try to be a smart ass."
@@ -2003,6 +2028,9 @@ def simulator(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             faction = Faction.objects.filter(tId=factionId).first()
             if faction is None:
                 return render(request, 'yata/error.html', {'errorMessage': 'Faction {} not found in the database.'.format(factionId)})
@@ -2080,12 +2108,16 @@ def simulatorChallenge(request):
             player = getPlayer(request.session["player"].get("tId"))
             factionId = player.factionId
 
+            if not player.factionAA:
+                return returnError(type=403, msg="You need AA rights.")
+
             faction = Faction.objects.filter(tId=factionId).first()
             if faction is None:
                 return render(request, 'yata/error.html', {'errorMessage': 'Faction {} not found in the database.'.format(factionId)})
 
-            challenges = FactionTree.objects.filter(shortname=request.POST.get("upgradeId"))
+            challenges = FactionTree.objects.filter(shortname=request.POST.get("upgradeId")).order_by("level")
             for ch in challenges:
+                print(ch)
                 ch.progress = ch.progress(faction)
 
             context = {"challenges": challenges}
diff --git a/templates/faction/bigbrother/index.html b/templates/faction/bigbrother/index.html
index 4257e7686..0bb84471d 100644
--- a/templates/faction/bigbrother/index.html
+++ b/templates/faction/bigbrother/index.html
@@ -32,38 +32,44 @@ <h2 class="title"><i class="fas fa-eye"></i>&nbsp;&nbsp;Big brother</h2>
 
 <h2 class="title"><i class="fas fa-project-diagram"></i>&nbsp;&nbsp;List of challenges</h2>
 <div class="module">
-    <table class="center">
-      <thead>
-        <tr>
-            <th>Type</th>
-            <th>Date</th>
-            <th>Remove</th>
-        </tr>
-      </thead>
+    <table class="center trshadow faction-bb-challenges">
       <tbody>
         {% for statType, timestamps in statsList.items %}
           {% for name, ts in timestamps %}
-            <tr>
-              <td class="a">{% ifchanged %}<b>{{name}}</b>{% endifchanged %}</td>
-              <td class="a">{{ts|ts2date}}</td>
-              <td class="a"><a class="faction-bb-delete" href="" data-val="{{statType}}-{{ts}}"><i class="fas fa-trash-alt" title="Delete challenge"></i></a></td>
+            {% ifchanged %}
+            <tr id="faction-bb-challenges-toggle-{{statType}}" style="cursor: pointer;">
+                <td class="aa"><b>{{name}}</b>&nbsp;&nbsp;<i class="fas fa-caret-right" style="margin-left:20px"></i></td>
+                <td class="b"></td>
+                <td class="c"></td>
+            </tr>
+            {% endifchanged %}
+            <tr class="faction-bb-challenges-catch-{{statType}}" style="display: none;">
+              <td class="ab"><i>{{name}}</i></td>
+              <td class="b">{{ts|ts2date}}</td>
+              {% if player.factionAA %}
+                <td class="c"><a class="faction-bb-delete" href="" data-val="{{statType}}-{{ts}}"><i class="fas fa-trash-alt" title="Delete challenge"></i></a></td>
+            {% else %}
+                <td class="c"><i class="fas fa-trash-alt neutral" title="You need AA perm to delete a challenge"></i></td>
+            {% endif %}
             </tr>
           {% endfor %}
         {% endfor %}
       </tbody>
     </table>
+</div>
 
-    {%if player.factionAA%}
-    <p><form>
-    Select a new challenge you want enter
+{%if player.factionAA%}
+<div class="module rounded">
+    <form class="inline">
+    Add a new challenge:&nbsp;&nbsp;
       <select class="faction-bb-enter-challenge">
         <option selected disabled hidden>Select a challenge</option>
         {% for k, v in bridge.items %}
-	{%if k != "allgyms" %}
-        <Option Value="{{k}}">{{v}}</option>
-	{%endif%}
+        	{%if k != "allgyms" %}
+                <Option Value="{{k}}">{{v}}</option>
+        	{%endif%}
         {% endfor %}
       </select>
-  </form></p>
-  {%endif%}
+  </form>
 </div>
+{%endif%}
diff --git a/templates/faction/bigbrother/script.js b/templates/faction/bigbrother/script.js
index 1773452f2..042607cae 100644
--- a/templates/faction/bigbrother/script.js
+++ b/templates/faction/bigbrother/script.js
@@ -48,3 +48,17 @@ $(document).on('click', '.faction-bb-delete', e=>{
     }).remove();
 
 });
+
+// big toggle challenges view
+$(document).on('click', 'tr[id^="faction-bb-challenges-toggle-"]', e=>{
+    e.preventDefault();
+    var tog = $(e.currentTarget);
+    var stat = tog.attr("id").split("-").pop()
+    var toshow = $(".faction-bb-challenges-catch-" + stat);
+    toshow.toggle();
+
+    var i = tog.find("i.fa-caret-right");
+    if(toshow.css("display") == "none") i.removeClass("fa-rotate-90")
+    else i.addClass("fa-rotate-90")
+
+});
diff --git a/yata/static/perso/css/faction.css b/yata/static/perso/css/faction.css
index 09d291ef4..1abb89b92 100644
--- a/yata/static/perso/css/faction.css
+++ b/yata/static/perso/css/faction.css
@@ -137,6 +137,11 @@ table.faction-bb-comparison td.a { width: 30%; text-align: left; }  /* x1 */
 table.faction-bb-comparison td.b { width: 25%; text-align: right; }  /* x2 */
 table.faction-bb-comparison td.c { width: 20%; text-align: center; }  /* x1 */
 
+table.faction-bb-challenges td.aa { width: 40%; text-align: left; }  /* x1 */
+table.faction-bb-challenges td.ab { width: 40%; text-align: right; }  /* x1 */
+table.faction-bb-challenges td.b { width: 40%; text-align: center; }  /* x1 */
+table.faction-bb-challenges td.c { width: 20%; text-align: center; }  /* x1 */
+
 select.faction-bb-stats-list {
   padding: 0;
   margin: 0;