Made token locations less counterintuitive