removed the map for readability