Preparing for the Jetpack upgrade system