Matthias' suggestions

This is what we talked about in the last PR.