Kept a bit on upgrading the scripts...