Incorporate some feedback from Aled Sage