some changes based on the content of D6.8