ADD rapport and some map changes