Should I do the same rewrite in Map then?