final changes for m3