Updated to use new token