Token Rework Part 2