updated by dev3 on v_1_1