improved 1.2.1