MOD: properly integrate the map