New revision following LWG review in Rapperswil.