added map and chosen