Added map and no circles