Pre-switch update