improve the custom wizard approach