updated all of the script