fix week 2-5