Changes for M7M