incorporating feedback from @richafrank