Made some changes to the Script