Tweaks to stop