Updated version of the MapDemo