Week5 Day 1
Merged fixes