Andreas suggested changes