modifying after talking to Bernd