Some of the week 5 changes done