changes after talking with mario hermann
changes after talking with mario hermann