Changes for exrm