merge 3 and 3_3