Upgrading work still ongoing but part that complet...

Upgrading work still ongoing but part that completed looks good.