major changes: canonical wizard behaviour