updated solutions for 1,2'