Updating code for m3 release