merging suggested changes by @erinsleonard