changes for new EMM and new logger