Improved with higher quality of maps