dev2 updated v_1_1 and commit