updated to 2.0-M2