Better token position tracking..