Week5

The code contains all the changes that we made in week 5