Replaced old script with new version