Rearranged maps for better flow