Updated the script a little