week 2 very last changes &week3 task 1,2 demo