Update based on Gerd's comments