integrated maps-widget
merging
again merging