Changes as per Graham's request.