Starting work on the upgrade path