addressing Greg's feedback
addressing Greg's feedback