More work to support editing.