update to address @gregcaporaso's comments