New version apm.el and wizard.el