Safer upgrade for current conditions