fixed map
fix merge conflicts from #13
Merge branch 'simran-fixed'