fully functional, removed wizard bug