With the slight change in edition workflow, change logic