Polishing to version 2.0.M1