OK, I've amended Nick's CS slightly.