Addressed comments by robdodson