updated for mf_struct