Made a better map