Tweaks to limit script