Updated to M3-SNAPSHOT