Update based on feedback from Gerd