Address feedback from @garthwebb