improving v1.2.0