incorporate comments from @sjkelly