added map and locations