Commit week 2 changes