maps done, need to fix data
merged