Changed token refresh routine