Incorporating feedback from @ocelotpotpie