Map calculations altered to match new algorithms