addressed comments from @jrrideout