"Merged Long's changes" and set up order...

for number tokens according to the rules.