Final Script Changes