Token join (12/24)

Token join