updated V1.2