Angelicos suggestions
merge conflicts