Reverted to not using token