diff --git a/Altoholic/Altoholic.lua b/Altoholic/Altoholic.lua
index 5f6a3ff..17258b4 100644
--- a/Altoholic/Altoholic.lua
+++ b/Altoholic/Altoholic.lua
@@ -338,7 +338,7 @@ function addon:OnEnable()
 	-- CoA: use a Lua constant, not GetAddOnMetadata — TOC metadata is cached at game launch
 	-- and does NOT refresh on /reload, so the .toc version looked stale ("still .18"). A Lua
 	-- constant re-evaluates on every /reload, giving a truthful loaded-code version. Bump with the .toc.
-	AltoholicFrameName:SetText("Altoholic |cFFFFFFFF3.3.002b-coa.30|r")
+	AltoholicFrameName:SetText("Altoholic |cFFFFFFFF3.3.002b-coa.22|r")
 
 	local realm = GetRealmName()
 	local player = UnitName("player")
@@ -608,17 +608,13 @@ end
 -- Fresh alts have partial per-module data, so every field is guarded here once
 -- instead of being copy-pasted (and missed) across the frames.
 function Altoholic:AddCharacterTooltipHeader(character)
-	local locClass, engClass = DS:GetCharacterClass(character)
-	local className = Altoholic:GetCoAClassName(engClass) or locClass or ""		-- CoA: current class name (PROPHET->Venomancer, …)
 	AltoTooltip:AddDoubleLine(DS:GetColoredCharacterName(character) or "?", DS:GetColoredCharacterFaction(character) or "")
 	AltoTooltip:AddLine(format("%s %s |r%s %s", L["Level"],
-		GREEN..(DS:GetCharacterLevel(character) or 0), DS:GetCharacterRace(character) or "", className), 1, 1, 1)
+		GREEN..(DS:GetCharacterLevel(character) or 0), DS:GetCharacterRace(character) or "", DS:GetCharacterClass(character) or ""), 1, 1, 1)
 end
 
 function Altoholic:SetCharacterRowNameLevel(entry, i, icon, character)
-	local locClass, engClass = DS:GetCharacterClass(character)
-	local className = Altoholic:GetCoAClassName(engClass) or locClass or ""		-- CoA: current class name
-	_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character) or "?", className))
+	_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character) or "?", DS:GetCharacterClass(character) or ""))
 	_G[entry..i.."Level"]:SetText(GREEN .. (DS:GetCharacterLevel(character) or 0))
 end
 
diff --git a/Altoholic/Altoholic.toc b/Altoholic/Altoholic.toc
index 7e30c77..c3b60cc 100644
--- a/Altoholic/Altoholic.toc
+++ b/Altoholic/Altoholic.toc
@@ -13,7 +13,7 @@
 
 ## Author: Thaoky, Telkar-RG
 ## X-Edited-By: Exiles (Sub-Net) — florian.berthold@sub-net.at
-## Version: 3.3.002b-coa.30
+## Version: 3.3.002b-coa.22
 ## X-Category: Inventory, Tradeskill, Mail
 ## X-Localizations: enUS, frFR, zhCN, zhTW, deDE, koKR, esES, esMX, ruRU
 ## X-Website: http://wow.curse.com/downloads/wow-addons/details/altoholic.aspx
diff --git a/Altoholic/Characters.lua b/Altoholic/Characters.lua
index c2699b4..8a6d365 100644
--- a/Altoholic/Characters.lua
+++ b/Altoholic/Characters.lua
@@ -98,7 +98,6 @@ local function AddRealm(AccountName, RealmName)
 				professions[#professions + 1] = {
 					name = p.name,
 					rank = p.rank or 0,
-					maxRank = p.maxRank or 0,		-- CoA: needed for the "rank/max" display in the vertical Skills list
 					spellID = DataStore:GetProfessionSpellID(p.name),
 				}
 			end
diff --git a/Altoholic/CoAClassColors.lua b/Altoholic/CoAClassColors.lua
index 799b096..29b8888 100644
--- a/Altoholic/CoAClassColors.lua
+++ b/Altoholic/CoAClassColors.lua
@@ -115,23 +115,3 @@ function Alto:GetCoAClassIcon(token)
     if not tc then return end
     return COA_CLASS_ICON_TEXTURE, tc[1], tc[2], tc[3], tc[4]
 end
-
--- CoA renamed its classes, but UnitClass()/DataStore still return the OLD tokens
--- (PROPHET, MONK, …). Map them to the current display names. Source: coa-omen/README-CoA.md.
--- Tokens not listed here keep their normal localized name (returns nil).
-local COA_CLASS_NAMES = {
-    HERO = "Hero", BARBARIAN = "Barbarian", WITCHDOCTOR = "Witch Doctor",
-    DEMONHUNTER = "Felsworn", WITCHHUNTER = "Witch Hunter", STORMBRINGER = "Stormbringer",
-    FLESHWARDEN = "Knight of Xoroth", GUARDIAN = "Guardian", MONK = "Templar",
-    SONOFARUGAL = "Bloodmage", RANGER = "Ranger", CHRONOMANCER = "Chronomancer",
-    NECROMANCER = "Necromancer", PYROMANCER = "Pyromancer", CULTIST = "Cultist",
-    STARCALLER = "Starcaller", SUNCLERIC = "Sun Cleric", TINKER = "Tinker",
-    PROPHET = "Venomancer", REAPER = "Reaper", WILDWALKER = "Primalist",
-    SPIRITMAGE = "Runemaster",
-}
-
--- Current CoA display name for a class token, or nil if unmapped (caller falls back).
-function Alto:GetCoAClassName(token)
-    if type(token) ~= "string" then return end
-    return COA_CLASS_NAMES[token]
-end
diff --git a/Altoholic/Frames/AccountSummary.lua b/Altoholic/Frames/AccountSummary.lua
index 2a90d21..98a04a1 100644
--- a/Altoholic/Frames/AccountSummary.lua
+++ b/Altoholic/Frames/AccountSummary.lua
@@ -168,7 +168,7 @@ end
 
 
 function ns:Update()
-	local VisibleLines = 18
+	local VisibleLines = 20
 	local frame = "AltoholicFrameSummary"
 	local entry = frame.."Entry"
 	
diff --git a/Altoholic/Frames/Activity.lua b/Altoholic/Frames/Activity.lua
index 6525114..2324d52 100644
--- a/Altoholic/Frames/Activity.lua
+++ b/Altoholic/Frames/Activity.lua
@@ -23,7 +23,7 @@ local ns = addon.Activity		-- ns = namespace
 local Characters = addon.Characters
 
 function ns:Update()
-	local VisibleLines = 18
+	local VisibleLines = 20
 	local frame = "AltoholicFrameActivity"
 	local entry = frame.."Entry"
 	
diff --git a/Altoholic/Frames/BagUsage.lua b/Altoholic/Frames/BagUsage.lua
index a478b50..8c29a9b 100644
--- a/Altoholic/Frames/BagUsage.lua
+++ b/Altoholic/Frames/BagUsage.lua
@@ -22,7 +22,7 @@ local ns = addon.BagUsage		-- ns = namespace
 local Characters = addon.Characters
 
 function ns:Update()
-	local VisibleLines = 18
+	local VisibleLines = 20
 	local frame = "AltoholicFrameBagUsage"
 	local entry = frame.."Entry"
 	
diff --git a/Altoholic/Frames/GuildBankTabs.lua b/Altoholic/Frames/GuildBankTabs.lua
index ea44eef..e7e60f6 100644
--- a/Altoholic/Frames/GuildBankTabs.lua
+++ b/Altoholic/Frames/GuildBankTabs.lua
@@ -72,7 +72,7 @@ function ns:Update()
 		BuildView()
 	end
 
-	local VisibleLines = 18
+	local VisibleLines = 20
 	local frame = "AltoholicFrameGuildBankTabs"
 	local entry = frame.."Entry"
 	
diff --git a/Altoholic/Frames/GuildMembers.lua b/Altoholic/Frames/GuildMembers.lua
index d9d4dd7..5a49210 100644
--- a/Altoholic/Frames/GuildMembers.lua
+++ b/Altoholic/Frames/GuildMembers.lua
@@ -285,7 +285,7 @@ function ns:Update()
 		BuildView()
 	end
 	
-	local VisibleLines = 17
+	local VisibleLines = 20
 	local frame = "AltoholicFrameGuildMembers"
 	local entry = frame.."Entry"
 	
diff --git a/Altoholic/Frames/GuildProfessions.lua b/Altoholic/Frames/GuildProfessions.lua
index 963f70a..b98653f 100644
--- a/Altoholic/Frames/GuildProfessions.lua
+++ b/Altoholic/Frames/GuildProfessions.lua
@@ -221,7 +221,7 @@ function ns:Update()
 		BuildView()
 	end
 
-	local VisibleLines = 18
+	local VisibleLines = 20
 	local frame = "AltoholicFrameGuildProfessions"
 	local entry = frame.."Entry"
 	
diff --git a/Altoholic/Frames/Quests.lua b/Altoholic/Frames/Quests.lua
index 77f24df..e6c8c26 100644
--- a/Altoholic/Frames/Quests.lua
+++ b/Altoholic/Frames/Quests.lua
@@ -34,7 +34,7 @@ function ns:Update()
 	local character = addon.Tabs.Characters:GetCurrent()
 
 	
-	local VisibleLines = 18
+	local VisibleLines = 20
 	local frame = "AltoholicFrameQuests"
 	local entry = frame.."Entry"
 	
diff --git a/Altoholic/Frames/Recipes.lua b/Altoholic/Frames/Recipes.lua
index cb1cb49..37d27b5 100644
--- a/Altoholic/Frames/Recipes.lua
+++ b/Altoholic/Frames/Recipes.lua
@@ -218,7 +218,7 @@ end
 function ns:Update()
 	local currentProfession = addon.TradeSkills.CurrentProfession
 	
-	local VisibleLines = 18
+	local VisibleLines = 20
 	local frame = "AltoholicFrameRecipes"
 	local entry = frame.."Entry"
 	
diff --git a/Altoholic/Frames/Skills.lua b/Altoholic/Frames/Skills.lua
index 164ede4..c9b8564 100644
--- a/Altoholic/Frames/Skills.lua
+++ b/Altoholic/Frames/Skills.lua
@@ -30,7 +30,7 @@ local inset = 2
 
 
 function ns:Update()
-	local VisibleLines = 18
+	local VisibleLines = 20
 	local frame = "AltoholicFrameSkills"
 	local entry = frame.."Entry"
 	local DS = DataStore
@@ -66,7 +66,6 @@ function ns:Update()
 				items[#items + 1] = { kind = "skill", viewLine = viewLine, character = character,
 					spellID = 33388, name = (L and L["Riding"]) or "Riding", rank = riding, maxRank = 300 }
 			end
-			items[#items + 1] = { kind = "spacer" }		-- blank row between characters
 		end
 	end
 
@@ -77,44 +76,26 @@ function ns:Update()
 		local item = items[i + offset]
 		if item then
 			_G[e.."Collapse"]:Hide()
+			_G[e.."Level"]:SetText("")
 			_G[e.."Skill1NormalText"]:SetText("")
 			_G[e.."CookingNormalText"]:SetText("")
 			_G[e.."FirstAidNormalText"]:SetText("")
 			_G[e.."FishingNormalText"]:SetText("")
 			_G[e.."RidingNormalText"]:SetText("")
+			_G[e.."Name"]:SetWidth(680)
+			_G[e.."Name"]:SetPoint("TOPLEFT", 15, 0)
+			_G[e.."NameNormalText"]:SetWidth(680)
 
-			if item.kind == "spacer" then
-				-- blank separator row between characters
-				_G[e.."Name"]:SetPoint("TOPLEFT", 15, 0)
-				_G[e.."NameNormalText"]:SetText("")
-				_G[e.."Level"]:SetText("")
-			elseif item.kind == "header" then
-				-- character header: gold "Name (Class)" across the row, no rank column
-				_G[e.."Name"]:SetPoint("TOPLEFT", 12, 0)
-				_G[e.."Name"]:SetWidth(420)
-				_G[e.."NameNormalText"]:SetWidth(420)
-				local cname = Characters:GetInfo(item.viewLine) or "?"		-- name from the key, always present (scanned char.name can be nil)
-				local locClass, engClass = DS:GetCharacterClass(item.character)
-				local className = Altoholic:GetCoAClassName(engClass) or locClass or ""		-- CoA: PROPHET->Venomancer, MONK->Templar, …
-				local classColor = DS:GetClassColor(item.character) or WHITE
-				_G[e.."NameNormalText"]:SetText( classColor .. cname .. "|r " .. WHITE .. "(" .. className .. ")" )
-				_G[e.."Level"]:SetText("")
+			if item.kind == "header" then
+				local _, class = DS:GetCharacterClass(item.character)
+				_G[e.."NameNormalText"]:SetText( (DS:GetColoredCharacterName(item.character) or "?") .. "   " .. WHITE .. "(" .. (class or "") .. ")" )
 			else
-				-- profession row: [icon] name in the Name cell (indented), rank/max in its own column
 				local iconEsc = ""
 				if item.spellID then
 					iconEsc = addon:TextureToFontstring2(addon:GetSpellIcon(item.spellID), size, size, inset, inset, inset, inset) .. " "
 				end
-				_G[e.."Name"]:SetPoint("TOPLEFT", 34, 0)
-				_G[e.."Name"]:SetWidth(170)
-				_G[e.."NameNormalText"]:SetWidth(170)
-				_G[e.."NameNormalText"]:SetText( iconEsc .. WHITE .. item.name )
-
 				local cap = (item.maxRank > 0) and item.maxRank or 450
-				_G[e.."Level"]:SetPoint("TOPLEFT", 195, 0)
-				_G[e.."Level"]:SetWidth(120)
-				_G[e.."Level"]:SetJustifyH("LEFT")
-				_G[e.."Level"]:SetText( ns:GetColor(item.rank, cap) .. item.rank .. " / " .. item.maxRank )
+				_G[e.."NameNormalText"]:SetText( "        " .. iconEsc .. WHITE .. item.name .. "   " .. ns:GetColor(item.rank, cap) .. item.rank .. "/" .. item.maxRank .. "|r" )
 			end
 			btn.coaItem = item
 			btn:SetID(item.viewLine or 0)
diff --git a/Altoholic/Frames/Skills.xml b/Altoholic/Frames/Skills.xml
index d275ec0..c669b2b 100644
--- a/Altoholic/Frames/Skills.xml
+++ b/Altoholic/Frames/Skills.xml
@@ -34,7 +34,7 @@
 	
 	<Button name="AltoSkillsTemplate" virtual="true">
 		<Size>
-			<AbsDimension x="615" y="22"/>
+			<AbsDimension x="745" y="22"/>
 		</Size>
 		<Layers>
 			<Layer level="BACKGROUND">
@@ -194,7 +194,7 @@
 
 	<Frame name="AltoholicFrameSkills" parent="AltoholicTabSummary" hidden="true">
 		<Size>
-			<AbsDimension x="615" y="414"/>
+			<AbsDimension x="745" y="414"/>
 		</Size>
 		<Anchors>
 			<Anchor point="TOPRIGHT">
diff --git a/Altoholic/Frames/TabCharacters.xml b/Altoholic/Frames/TabCharacters.xml
index 4303347..8cdfad4 100644
--- a/Altoholic/Frames/TabCharacters.xml
+++ b/Altoholic/Frames/TabCharacters.xml
@@ -243,44 +243,63 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<!-- CoA: a character can learn every profession. Lay the profession quick-icons out
-			     as a wrapped 4-per-row grid in the open middle-left area (the taller window has room
-			     below the Character dropdown). UpdateViewIcons fills/hides Prof1..12 dynamically. -->
 			<Button name="$parent_Prof1" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="TOPLEFT" relativeTo="AltoholicTabCharacters" relativePoint="TOPLEFT"><Offset x="30" y="-205" /></Anchor></Anchors>
+				<Anchors>
+					<Anchor point="TOPLEFT" relativeTo="AltoholicTabCharacters" relativePoint="TOPLEFT" >
+						<Offset x="30" y="-235" />
+					</Anchor>
+				</Anchors>
 			</Button>
 			<Button name="$parent_Prof2" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof1" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
+				<Anchors>
+					<Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof1" relativePoint="BOTTOMRIGHT" >
+						<Offset x="5" y="0" />
+					</Anchor>
+				</Anchors>
 			</Button>
-			<Button name="$parent_Prof3" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof2" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
+			<!-- CoA: characters can know many more than 2 primary professions. Extra slots;
+			     UpdateViewIcons fills/hides them dynamically and stops at the last one. -->
+			<Button name="$parent_Prof3" inherits="AltoViewIconTemplate" hidden="true">
+				<Anchors>
+					<Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof2" relativePoint="BOTTOMRIGHT" >
+						<Offset x="5" y="0" />
+					</Anchor>
+				</Anchors>
 			</Button>
-			<Button name="$parent_Prof4" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof3" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
+			<Button name="$parent_Prof4" inherits="AltoViewIconTemplate" hidden="true">
+				<Anchors>
+					<Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof3" relativePoint="BOTTOMRIGHT" >
+						<Offset x="5" y="0" />
+					</Anchor>
+				</Anchors>
 			</Button>
-			<Button name="$parent_Prof5" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="TOPLEFT" relativeTo="$parent_Prof1" relativePoint="BOTTOMLEFT"><Offset x="0" y="-5" /></Anchor></Anchors>
+			<Button name="$parent_Prof5" inherits="AltoViewIconTemplate" hidden="true">
+				<Anchors>
+					<Anchor point="TOPLEFT" relativeTo="$parent_Prof1" relativePoint="BOTTOMLEFT" >
+						<Offset x="5" y="0" />
+					</Anchor>
+				</Anchors>
 			</Button>
-			<Button name="$parent_Prof6" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof5" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
+			<Button name="$parent_Prof6" inherits="AltoViewIconTemplate" hidden="true">
+				<Anchors>
+					<Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof5" relativePoint="BOTTOMRIGHT" >
+						<Offset x="5" y="0" />
+					</Anchor>
+				</Anchors>
 			</Button>
-			<Button name="$parent_Prof7" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof6" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
+			<Button name="$parent_Prof7" inherits="AltoViewIconTemplate" hidden="true">
+				<Anchors>
+					<Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof6" relativePoint="BOTTOMRIGHT" >
+						<Offset x="5" y="0" />
+					</Anchor>
+				</Anchors>
 			</Button>
-			<Button name="$parent_Prof8" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof7" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
-			</Button>
-			<Button name="$parent_Prof9" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="TOPLEFT" relativeTo="$parent_Prof5" relativePoint="BOTTOMLEFT"><Offset x="0" y="-5" /></Anchor></Anchors>
-			</Button>
-			<Button name="$parent_Prof10" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof9" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
-			</Button>
-			<Button name="$parent_Prof11" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof10" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
-			</Button>
-			<Button name="$parent_Prof12" inherits="AltoViewIconTemplate">
-				<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof11" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
+			<Button name="$parent_Prof8" inherits="AltoViewIconTemplate" hidden="true">
+				<Anchors>
+					<Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof7" relativePoint="BOTTOMRIGHT" >
+						<Offset x="5" y="0" />
+					</Anchor>
+				</Anchors>
 			</Button>
 
 			<Button name="$parent_Sort1" inherits="AltoSortButtonTemplate" id="1">
diff --git a/DataStore_Achievements/DataStore_Achievements.lua b/DataStore_Achievements/DataStore_Achievements.lua
index ebf0243..9ab3ece 100644
--- a/DataStore_Achievements/DataStore_Achievements.lua
+++ b/DataStore_Achievements/DataStore_Achievements.lua
@@ -235,8 +235,7 @@ end
 -- *** EVENT HANDLERS ***
 function addon:PLAYER_ALIVE()
 	-- print("DataStore_Achievements.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 	
 	ScanAllAchievements()
 	ScanProgress()
diff --git a/DataStore_Crafts/DataStore_Crafts.lua b/DataStore_Crafts/DataStore_Crafts.lua
index 35eed10..6c9d88e 100644
--- a/DataStore_Crafts/DataStore_Crafts.lua
+++ b/DataStore_Crafts/DataStore_Crafts.lua
@@ -546,8 +546,7 @@ end
 -- *** Event Handlers ***
 local function OnPlayerAlive()
 	-- print("DataStore_Crafts.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 	
 	ScanProfessionLinks()
 end
diff --git a/DataStore_Pets/DataStore_Pets.lua b/DataStore_Pets/DataStore_Pets.lua
index cce3a72..4182863 100644
--- a/DataStore_Pets/DataStore_Pets.lua
+++ b/DataStore_Pets/DataStore_Pets.lua
@@ -46,8 +46,7 @@ end
 -- *** Event Handlers ***
 local function OnPlayerAlive()
 	-- print("DataStore_Pets.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 	
 	ScanCompanions("CRITTER")
 	ScanCompanions("MOUNT")
diff --git a/DataStore_Quests/DataStore_Quests.lua b/DataStore_Quests/DataStore_Quests.lua
index b354c1c..ca68a76 100644
--- a/DataStore_Quests/DataStore_Quests.lua
+++ b/DataStore_Quests/DataStore_Quests.lua
@@ -177,8 +177,7 @@ end
 -- *** Event Handlers ***
 local function OnPlayerAlive()
 	-- print("DataStore_Quests.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 	
 	ScanQuests()
 end
diff --git a/DataStore_Reputations/DataStore_Reputations.lua b/DataStore_Reputations/DataStore_Reputations.lua
index 6bf9584..f1bb674 100644
--- a/DataStore_Reputations/DataStore_Reputations.lua
+++ b/DataStore_Reputations/DataStore_Reputations.lua
@@ -177,8 +177,7 @@ end
 -- *** EVENT HANDLERS ***
 function addon:PLAYER_ALIVE()
 	-- print("DataStore_Reputations.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 	
 	ScanReputations()
 end
diff --git a/DataStore_Skills/DataStore_Skills.lua b/DataStore_Skills/DataStore_Skills.lua
index fa774f3..22b04b3 100644
--- a/DataStore_Skills/DataStore_Skills.lua
+++ b/DataStore_Skills/DataStore_Skills.lua
@@ -239,8 +239,7 @@ end
 -- *** EVENT HANDLERS ***
 function addon:PLAYER_ALIVE()
 	-- print("DataStore_Skills.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 
 	ScanSkills()
 end
diff --git a/DataStore_Spells/DataStore_Spells.lua b/DataStore_Spells/DataStore_Spells.lua
index e652d8d..3b2e43c 100644
--- a/DataStore_Spells/DataStore_Spells.lua
+++ b/DataStore_Spells/DataStore_Spells.lua
@@ -105,8 +105,7 @@ end
 -- *** EVENT HANDLERS ***
 function addon:PLAYER_ALIVE()
 	-- print("DataStore_Spells.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 	
 	ScanSpells()
 end
diff --git a/DataStore_Stats/DataStore_Stats.lua b/DataStore_Stats/DataStore_Stats.lua
index 9c06e19..a230828 100644
--- a/DataStore_Stats/DataStore_Stats.lua
+++ b/DataStore_Stats/DataStore_Stats.lua
@@ -156,8 +156,7 @@ end
 -- *** EVENT HANDLERS ***
 function addon:PLAYER_ALIVE()
 	-- print("DataStore_Stats.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 	
 	ScanStats()
 end
diff --git a/DataStore_Talents/DataStore_Talents.lua b/DataStore_Talents/DataStore_Talents.lua
index 3de4ddb..f979fb2 100644
--- a/DataStore_Talents/DataStore_Talents.lua
+++ b/DataStore_Talents/DataStore_Talents.lua
@@ -419,8 +419,7 @@ end
 -- *** EVENT HANDLERS ***
 function addon:PLAYER_ALIVE()
 	-- print("DataStore_Talents.lua") -- DEBUG 2025 07 21
-	if addon.coaScannedThisSession then return end		-- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
-	addon.coaScannedThisSession = true
+	if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
 	
 	ScanTalents()
 	ScanTalentReference()