v1.2.0. Improvement