pushing distance into maps
pushing more into map
more tidy up