remake 1_1 and 1_3