possible to get rid of ``map`` here?