Incorporate Alisdair's comments