Could this scenario not be combined into the general edit scenario?