reorder token
wip
remove placeholder __