fixed up 2_2