changing token handling