Updated scripts to make them easier to use