Tweaks to new tokens