Edit feature improved