week 5 updates
merge