updated v1.2.2