Got upgrade/downgrade paths working