first set of changes to make syncronized map