For next upgrade.