updated v1.2