Put 'useToken' back in