Updating script to for v2.0