Incorporate feedback from @gylaz