Week3 update
Week5 fully working