diff --git a/Server/src/main/content/minigame/barbassault/CaptainCainDialogue.kt b/Server/src/main/content/minigame/barbassault/CaptainCainDialogue.kt
index d4b31bc8e..e88228eb2 100644
--- a/Server/src/main/content/minigame/barbassault/CaptainCainDialogue.kt
+++ b/Server/src/main/content/minigame/barbassault/CaptainCainDialogue.kt
@@ -27,6 +27,7 @@ class CaptainCainDialogue(player: Player? = null) : DialoguePlugin(player) {
     override fun open(vararg args: Any?): Boolean {
         npcl(FacialExpression.FRIENDLY, "Hello, there, adventurer. Say, you wouldn't happen to be interested in purchasing a Fighter Torso would you?")
         stage = 0
+        player.setAttribute("barbass:tut", true)
         return true
     }
 
@@ -72,4 +73,26 @@ class CaptainCainDialogue(player: Player? = null) : DialoguePlugin(player) {
         return intArrayOf(NPCs.CAPTAIN_CAIN_5030)
     }
 
-}
\ No newline at end of file
+}
+
+/**
+ * lets keep the meme of WHEN you were able to buy a torso and ryans promise <3
+ *
+ * dialogoption to -> I heard you could sell me a fighter's torso.
+ * FacialExpression.HALF_GUILTY, NPC: Sell you a torso? Oh, I couldn’t possibly… ,
+ *                               I’m only here to teach adventurers the basics.
+ *
+ * FacialExpression.ASKING Player: But people say you did… back when Ryan promised Barbarian Assault.
+ *
+ * NPC: People say a lot of things.
+ *      I’ve never officially offered anything like that.
+ *      Official operations only started on {RELEASE_DATE} — anything before that is… unofficial.
+ *
+ * Player:“The promise was made on $start. Some adventurers even counted — it’s been $days days since then.”
+ *
+ * FacialExpression.SUSPICIOUS NPC: I see… the adventurers remember everything......
+ *
+ * FacialExpression.ANNOYED NPC: Fine, keep your rumours. But don’t expect me to give a torso for them.
+ *                               Now, back to training!!
+ *
+ */
\ No newline at end of file
diff --git a/Server/src/main/content/minigame/barbassault/CommanderConnad.kt b/Server/src/main/content/minigame/barbassault/CommanderConnad.kt
index 19f26ad0a..df3eebd00 100644
--- a/Server/src/main/content/minigame/barbassault/CommanderConnad.kt
+++ b/Server/src/main/content/minigame/barbassault/CommanderConnad.kt
@@ -21,14 +21,13 @@ class CommanderConnad(player: Player? = null) : DialoguePlugin(player) {
         return CommanderConnad(player)
     }
     override fun open(vararg args: Any?): Boolean {
-        //todo check if completed tut with Captain
-        stage = 5
+        val tutComplete = player.getAttribute("barbass:tut", false)
+        stage = if (tutComplete) 5 else 0
         handle(0,0)
         return true
     }
     override fun handle(componentID: Int, buttonID: Int): Boolean {
         val barbasspoints = player.getBarbPoints()
-
         val displayName = player.name.replaceFirstChar { it.uppercaseChar() }
 
         when (stage) {
diff --git a/Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt b/Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt
index b7847e37e..3cb45f130 100644
--- a/Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt
+++ b/Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt
@@ -85,7 +85,7 @@ class BarbassaultSession(  val activity: BarbassaultActivity ? = null) : MapArea
 
         for (player in team.allPlayers()) {
             clearLogoutListener(player, "ba-logout")
-           // player.removeAttribute("ba-session")
+            player.removeAttribute("ba-session")
             player.properties.teleportLocation = Location.create(2593, 5264, 0)
             player.interfaceManager.closeOverlay()
         }
@@ -174,12 +174,12 @@ class BarbassaultSession(  val activity: BarbassaultActivity ? = null) : MapArea
         log(this::class.java, Log.FINE, "ENTERED Barbassault Arena")
 
         val player = entity as? Player ?: return
-       // val waveNum = player.getAttribute("barbass:wave", 1)
+        val waveNum = player.getAttribute("barbass:wave", 1)
         val wornIconId = getItemFromEquipment(player, EquipmentSlot.CAPE)?.id
         val interfaceId = getIconInterfaceId(wornIconId ?: -1)
 
         interfaceId?.let {
-            sendMessage(player, "----- Wave: \$waveNum -----")
+            sendMessage(player, "----- Wave: $waveNum -----")
             openOverlay(player, it)
         }