Switched from newMap to lastMap
Merge
Attempt at optimised drawing