add Patrick Metzdorf's 5 cents
merge conflicts