fix week 1 + 2