M6 upgrade

Following