edit 2_4, add 2_5, 2_6 and 4_4