added map
merged jared's work