simran's updates
merge
added a map
morestufff
merging pull