Upgrading all other molecule scripts to the new form and method