Final set of updates for on the day
Fixing merge conflict