Improved map making