addressed comments from @jrrideout.