addressed comments from @wasade