working on new map integration