01 fixed and 02 done