Updating scripts

Updating scripts to match the final versions from the original
repository.