#13 Resized token
#13 Rearranged tokens positions