Update Peters contribution. Added Stefan Henzi