start of changes for M3