Updating script per issue #3