Trying to improve map on device