Further work on FMF wizard