More work on new window wizard