Revert "Further updates"

This reverts commit b8e3031259e57b2b375298fbcc9ff7f461fd3f1e.
Revert "Revert "Further updates""

This reverts commit 54fe122992b1d93e0a92608910e1fa41c99687cb.
Revert "Further updates"

This reverts commit b8e3031259e57b2b375298fbcc9ff7f461fd3f1e.
Revert "Change at Friars Walk"

This reverts commit ebe4097ca0c109e259e58c37cd1b27ef86f42be4.