reflecting some comments from Hendrik