Next-gen upgrade