token position now goes with token