addressing comments from @wasade