Tweaked the scripts