v1.1.0. Improvement