better map, makes a lot more sense