Upgraded to version 2.0-M3