Move M206 improvements to M306 and leave M206 as is