made changes after talking with Bernd