Almost complete new map algorithm