commit finished v_1.0