Primary Token Rework