Tweaked scripts