Optimized edit process