merge with tonys new map