Edit Wizard version 2