Fix based on Gerd's comments
Update based on Gerd's comments