merge week 2 changes