changes before graph upgrade