address comments from @WouterJ