incorporating comments from @ruthangus