Some Script Changes