added logic to newMap, ready to completely remove firstMap