further progress in supporting both flavors of MES formats