Updated scripts to match current versions from Ph