merge with fxm-fm + clean up