Tweaks to the more-or-less