changes to make custom wizard work