genrator refactorred, MUSI set removed