Merging these changes in to the live site