Review: using map the right place