now that I see `mapify` below, maybe that should be used here too?