changes requested by Ian.