Re-work Update feature.