suggestions from @pwalczysko and @ximenesuk