address comments from @wasade