reflect the comments from Gregor