version discussed with Stefan and Steffen