added token separation