Updated for wizards (never thought a commit would say that..)