diff --git a/examples/condor-grid-example/CondorGridSimulator.cpp b/examples/condor-grid-example/CondorGridSimulator.cpp
index b3df74678b..a03f87b624 100644
--- a/examples/condor-grid-example/CondorGridSimulator.cpp
+++ b/examples/condor-grid-example/CondorGridSimulator.cpp
@@ -15,142 +15,6 @@
 #include "CondorTimestamp.h"
 #include "wrench/tools/pegasus/PegasusWorkflowParser.h"
 
-void generatePlatform(std::string platform_file_path,
-                      int disk_speed,
-                      int batch_bandwidth = 0,
-                      long batch_per_node_flops = 0,
-                      int num_hosts = 2){
-
-    if (platform_file_path.empty()) {
-        throw std::invalid_argument("generatePlatform() platform_file_path cannot be empty");
-    }
-    if (disk_speed <= 0) {
-        throw std::invalid_argument("generatePlatform() disk_speed must be greater than 0");
-    }
-
-    std::string xml_string = "<?xml version='1.0'?>\n"
-                             "<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n"
-                             "<platform version=\"4.1\">\n"
-                             "<zone id=\"AS0\" routing=\"Full\">\n"
-                             "  <host id=\"DualCoreHost\" speed=\"1f\" core=\"2\" >\n"
-                             "      <disk id=\"large_disk\" read_bw=\"100MBps\" write_bw=\"100MBps\">\n"
-                             "          <prop id=\"size\" value=\"1000000GB\"/>\n"
-                             "          <prop id=\"mount\" value=\"/\"/>\n"
-                             "      </disk>\n"
-                             "      <disk id=\"scratch\" read_bw=\"100MBps\" write_bw=\"100MBps\">\n"
-                             "          <prop id=\"size\" value=\"1000000GB\"/>\n"
-                             "          <prop id=\"mount\" value=\"/scratch\"/>\n"
-                             "      </disk>\n"
-                             "  </host>\n"
-                             "  <host id=\"QuadCoreHost\" speed=\"1f\" core=\"4\" >\n"
-                             "      <disk id=\"large_disk\" read_bw=\"100MBps\" write_bw=\"100MBps\">\n"
-                             "          <prop id=\"size\" value=\"1000000GB\"/>\n"
-                             "          <prop id=\"mount\" value=\"/\"/>\n"
-                             "      </disk>\n"
-                             "      <disk id=\"scratch\" read_bw=\"100MBps\" write_bw=\"100MBps\">\n"
-                             "          <prop id=\"size\" value=\"1000000GB\"/>\n"
-                             "          <prop id=\"mount\" value=\"/scratch\"/>\n"
-                             "      </disk>\n"
-                             "  </host>\n"
-                             "  <link id=\"1\" bandwidth=\"5000GBps\" latency=\"0us\"/>\n"
-                             "  <link id=\"2\" bandwidth=\"5000GBps\" latency=\"0us\"/>\n"
-                             "  <route src=\"DualCoreHost\" dst=\"QuadCoreHost\"> <link_ctn id=\"1\"/> </route>\n"
-                             "</zone>\n"
-                             "</platform>\n";
-
-    pugi::xml_document xml_doc;
-
-    if (xml_doc.load_string(xml_string.c_str(), pugi::parse_doctype)) {
-
-        pugi::xml_node last_host = xml_doc.child("platform").child("zone").find_child_by_attribute("host",
-                                                                                                   "id",
-                                                                                                   "QuadCoreHost");
-        pugi::xml_node last_link = xml_doc.child("platform").child("zone").find_child_by_attribute("link",
-                                                                                                   "id",
-                                                                                                   "2");
-
-        for(int i=0;i<num_hosts;i++){
-            pugi::xml_node host = xml_doc.child("platform").child("zone").prepend_child("host");
-            host.append_attribute("id") = ("slurm_worker_"+std::to_string(i)).c_str();
-            host.append_attribute("speed") = (std::string(std::to_string(batch_per_node_flops) + "f").c_str());
-            host.append_attribute("core") = "10";
-
-
-            ///Create disk and set to r/w value
-            pugi::xml_node disk_1 = host.append_child("disk");
-            disk_1.append_attribute("id") = ("large_disk");
-            disk_1.append_attribute("read_bw") = std::string(std::to_string(disk_speed) + "MBps").c_str();
-            disk_1.append_attribute("write_bw") = std::string(std::to_string(disk_speed) + "MBps").c_str();
-            pugi::xml_node disk_1_size = disk_1.append_child("prop");
-            disk_1_size.append_attribute("id") = "size";
-            disk_1_size.append_attribute("value") = "1000000GB";
-
-            pugi::xml_node disk_1_mount = disk_1.append_child("prop");
-            disk_1_mount.append_attribute("id") = "mount";
-            disk_1_mount.append_attribute("value") = "/";
-
-
-            pugi::xml_node disk_2 = host.append_child("disk");
-            disk_2.append_attribute("id") = ("scratch");
-            disk_2.append_attribute("read_bw") = std::string(std::to_string(disk_speed) + "MBps").c_str();
-            disk_2.append_attribute("write_bw") = std::string(std::to_string(disk_speed) + "MBps").c_str();
-            pugi::xml_node disk_2_size = disk_2.append_child("prop");
-            disk_2_size.append_attribute("id") = "size";
-            disk_2_size.append_attribute("value") = "1000000GB";
-
-            pugi::xml_node disk_2_mount = disk_2.append_child("prop");
-            disk_2_mount.append_attribute("id") = "mount";
-            disk_2_mount.append_attribute("value") = "/scratch";
-
-            ///ADD LINKS
-            pugi::xml_node link_1 = xml_doc.child("platform").child("zone").insert_child_after("link", last_host);
-            link_1.append_attribute("id") = (std::to_string(i)+"_1").c_str();
-            link_1.append_attribute("bandwidth") = std::string(std::to_string(batch_bandwidth) + "MBps").c_str();
-            link_1.append_attribute("latency") = "0us";
-
-            pugi::xml_node link_2 = xml_doc.child("platform").child("zone").insert_child_after("link", last_host);
-            link_2.append_attribute("id") = (std::to_string(i)+"_2").c_str();
-            link_2.append_attribute("bandwidth") = std::string(std::to_string(batch_bandwidth) + "MBps").c_str();
-            link_2.append_attribute("latency") = "0us";
-
-            ///ADD ROUTES
-            pugi::xml_node route_1 = xml_doc.child("platform").child("zone").insert_child_after("route", last_link);
-            route_1.append_attribute("src") = "DualCoreHost";
-            route_1.append_attribute("dst") = ("slurm_worker_"+std::to_string(i)).c_str();
-            pugi::xml_node link_ctn_1 = route_1.append_child("link_ctn");
-            link_ctn_1.append_attribute("id") = (std::to_string(i)+"_1").c_str();
-
-            pugi::xml_node route_2 = xml_doc.child("platform").child("zone").insert_child_after("route", last_link);
-            route_2.append_attribute("src") = "QuadCoreHost";
-            route_2.append_attribute("dst") = ("slurm_worker_"+std::to_string(i)).c_str();
-            pugi::xml_node link_ctn_2 = route_2.append_child("link_ctn");
-            link_ctn_2.append_attribute("id") = (std::to_string(i)+"_2").c_str();
-            if(i>0){
-                for(int j=0;j<i;j++){
-                    ///CREATE ROUTES TO PREVIOUSLY CREATED HOSTS
-                    pugi::xml_node inter_host_link = xml_doc.child("platform").child("zone").insert_child_after("link", last_host);
-                    inter_host_link.append_attribute("id") = (std::to_string(i)+"_"+std::to_string(j)+"_0").c_str();
-                    inter_host_link.append_attribute("bandwidth") = std::string(std::to_string(batch_bandwidth) + "MBps").c_str();
-                    inter_host_link.append_attribute("latency") = "0us";
-
-                    pugi::xml_node inter_host_route = xml_doc.child("platform").child("zone").insert_child_after("route", last_link);
-                    inter_host_route.append_attribute("src") = ("slurm_worker_"+std::to_string(j)).c_str();
-                    inter_host_route.append_attribute("dst") = ("slurm_worker_"+std::to_string(i)).c_str();
-                    pugi::xml_node inter_host_link_ctn = inter_host_route.append_child("link_ctn");
-                    inter_host_link_ctn.append_attribute("id") = (std::to_string(i)+"_"+std::to_string(j)+"_0").c_str();
-                }
-            }
-        }
-
-        xml_doc.save_file(platform_file_path.c_str());
-
-    } else {
-        throw std::runtime_error("something went wrong with parsing xml string");
-    }
-
-}
-
-
 
 /**
  * ./wrench-example-condor-grid-universe [disk-speed in MBps] [bandwidth in MBps, storage service to batch service] ...
@@ -162,549 +26,56 @@ int main(int argc, char **argv) {
     // Create and initialize a simulation
     auto *simulation = new wrench::Simulation();
 
+    /* Parse WRENCH-specific and SimGrid-specific command-line arguments */
     simulation->init(&argc, argv);
-    int disk_speed = std::stoi(std::string(argv[1]));
-    double pre_execution_overhead;
-    double post_execution_overhead;
-    int batch_bandwidth;
-    long batch_per_node_flops;
-    double per_task_overhead;
-
-    bool diamond_exec = false;
-    bool three_task = false;
-    bool harpoon_join = false;
-    bool ten_split = false;
-    bool join_merge_join_merge = false;
-    bool three_four_split = false;
-    bool genome = false;
-    bool montage = false;
-    bool montage_4 = false;
-    bool montage_8 = false;
-    bool montage_16 = false;
-
-    int num_hosts = 2;
 
-
-    if(argc>2){
-        batch_bandwidth = std::stoi(std::string(argv[2]));
-    }
-    if(argc>3){
-        pre_execution_overhead = std::stod(std::string(argv[3]));
-        post_execution_overhead = std::stod(std::string(argv[4]));
-        per_task_overhead = std::stod(std::string(argv[5]));
-    }
-    if(argc>6){
-        batch_per_node_flops = std::stol(std::string(argv[6]));
-        //printf("%ld\n",batch_per_node_flops);
-    }
-    if(argc>=8 && std::stod(std::string(argv[7]))==1){
-        three_task = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==2) {
-        diamond_exec = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==3){
-        harpoon_join = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==4) {
-        ten_split = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==5) {
-        join_merge_join_merge = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==6) {
-        three_four_split = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==7) {
-        genome = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==8) {
-        montage = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==9) {
-        montage_4 = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==10) {
-        montage_8 = true;
-    } else if (argc>=8 && std::stod(std::string(argv[7]))==11) {
-        montage_16 = true;
+    /* Parse simulator-specific command-line arguments */
+    if (argc != 3) {
+        std::cerr << "Usage: " << argv[0] << " <XML platform file> <# tasks>\n";
+        exit(1)
     }
 
-    if(argc==9){
-        num_hosts = std::stoi(std::string(argv[8]));
+    /* Parse the number of tasks passed as a command-line argument */
+    int num_tasks = 0;
+    try {
+        num_tasks = std::atoi(argv[2]);
+    } catch (std::invalid_argument &e) {
+        std::cerr << "Invalid number of tasks\n";
+        exit(1);
     }
 
-    std::string platform_file_path = "/tmp/platform.xml";
-    if(argc<3){
-        generatePlatform(platform_file_path, disk_speed);
-    } else {
-        generatePlatform(platform_file_path, disk_speed, batch_bandwidth, batch_per_node_flops, num_hosts);
+    /* Initialize the platform with the XML file */
+    simulation->instantiatePlatform(argv[1]);
+
+    /* Create a workflow of independent 5-core tasks, each with some input file and an output file */
+    auto workflow = new wrench::Workflow();
+    for (int i=0; i < num_tasks; i++) {
+        auto task   = workflow->addTask("task_" + std::to_string(i), (i+1) * 1000.00, 5, 5, 0);
+        auto input  = workflow->addFile("task_" + std::to_string(i) + ".in", 1000);
+        auto output = workflow->addFile("task_" + std::to_string(i) + ".out", 1000);
+        task->addInputFile(input);
+        task->addOutputFile(output);
     }
-    simulation->instantiatePlatform(platform_file_path);
-
-    wrench::WorkflowFile *input_file1, *output_file1, *input_file2, *output_file2,
-            *input_file3, *output_file3, *input_file4, *output_file4,
-            *input_file5, *output_file5, *input_file6, *output_file6,
-            *input_file7, *output_file7, *input_file8, *output_file8,
-            *input_file9, *output_file9, *input_file10, *output_file10,
-            *input_file11, *output_file11, *input_file12, *output_file12,
-            *input_file13, *output_file13, *input_file14, *output_file14,
-            *input_file15, *output_file15, *input_file16, *output_file16,
-            *input_file17, *output_file17;
-    wrench::WorkflowTask *task1, *task2, *task3, *task4, *task5, *task6, *task7,
-            *task8, *task9, *task10, *task11, *task12, *task13, *task14, *task15,
-            *task16, *task17;
-    std::shared_ptr<wrench::ComputeService> compute_service = nullptr;
-    std::shared_ptr<wrench::StorageService> storage_service = nullptr;
-    std::shared_ptr<wrench::StorageService> storage_service2 = nullptr;
-
-    // Get a hostname
-    std::string hostname = "DualCoreHost";
-
-    wrench::Workflow *grid_workflow;
-    std::unique_ptr<wrench::Workflow> workflow_unique_ptr1;
-    workflow_unique_ptr1 = std::unique_ptr<wrench::Workflow>(new wrench::Workflow());
-    grid_workflow = workflow_unique_ptr1.get();
-
-    input_file1 = grid_workflow->addFile("input_file1", 10000000000.0);
-    output_file1 = grid_workflow->addFile("output_file1", 10000000000.0);
-
-
-    //task1 = grid_workflow->addTask("grid_task1", 87867450000.0, 1, 1, 0);
-    //task1 = grid_workflow->addTask("grid_task1", 3050000000.0, 1, 1, 0);
-
-    task1 = grid_workflow->addTask("grid_task1", 500000000000.0, 1, 1, 0);
-    task1->addInputFile(input_file1);
-    task1->addOutputFile(output_file1);
-    if(diamond_exec){
-        input_file2 = grid_workflow->addFile("input_file2", 10000000000.0);
-        output_file2 = grid_workflow->addFile("output_file2", 10000000000.0);
-        input_file3 = grid_workflow->addFile("input_file3", 10000000000.0);
-        output_file3 = grid_workflow->addFile("output_file3", 10000000000.0);
-        input_file4 = grid_workflow->addFile("input_file4", 10000000000.0);
-        output_file4 = grid_workflow->addFile("output_file4", 10000000000.0);
 
-        task2 = grid_workflow->addTask("grid_task2", 500000000000.0, 1, 1, 0);
-        task2->addInputFile(input_file2);
-        task2->addOutputFile(output_file2);
-        task3 = grid_workflow->addTask("grid_task3", 500000000000.0, 1, 1, 0);
-        task3->addInputFile(input_file3);
-        task3->addOutputFile(output_file3);
-        task4 = grid_workflow->addTask("grid_task4", 500000000000.0, 1, 1, 0);
-        task4->addInputFile(input_file4);
-        task4->addOutputFile(output_file4);
+    /* Create a storage service on the WMS host */
+    auto local_ss = new wrench::SimpleStorageService("WMSHost", {"/"});
 
+    /* Create a batch service */
+    std::vector<std::string> batch_nodes = {"BatchNode1", "BatchNode2", "BatchNode3", "BatchNode4"};
+    auto batch_cs = new wrench::BareMetalComputeService(
+            "BatchHeadNode",
+            batch_nodes,
+            "/scratch");
 
-        grid_workflow->addControlDependency(task1, task2);
-        grid_workflow->addControlDependency(task1, task3);
-        grid_workflow->addControlDependency(task3, task4);
-        grid_workflow->addControlDependency(task2, task4);
-    } else if (harpoon_join) {
-        input_file2 = grid_workflow->addFile("input_file2", 10000000000.0);
-        output_file2 = grid_workflow->addFile("output_file2", 10000000000.0);
-        input_file3 = grid_workflow->addFile("input_file3", 10000000000.0);
-        output_file3 = grid_workflow->addFile("output_file3", 10000000000.0);
-        input_file4 = grid_workflow->addFile("input_file4", 10000000000.0);
-        output_file4 = grid_workflow->addFile("output_file4", 10000000000.0);
-        input_file5 = grid_workflow->addFile("input_file5", 10000000000.0);
-        output_file5 = grid_workflow->addFile("output_file5", 10000000000.0);
-        input_file6 = grid_workflow->addFile("input_file6", 10000000000.0);
-        output_file6 = grid_workflow->addFile("output_file6", 10000000000.0);
-        input_file7 = grid_workflow->addFile("input_file7", 10000000000.0);
-        output_file7 = grid_workflow->addFile("output_file7", 10000000000.0);
-        input_file8 = grid_workflow->addFile("input_file8", 10000000000.0);
-        output_file8 = grid_workflow->addFile("output_file8", 10000000000.0);
-
-        task2 = grid_workflow->addTask("grid_task2", 500000000000.0, 1, 1, 0);
-        task2->addInputFile(input_file2);
-        task2->addOutputFile(output_file2);
-        task3 = grid_workflow->addTask("grid_task3", 500000000000.0, 1, 1, 0);
-        task3->addInputFile(input_file3);
-        task3->addOutputFile(output_file3);
-        task4 = grid_workflow->addTask("grid_task4", 500000000000.0, 1, 1, 0);
-        task4->addInputFile(input_file4);
-        task4->addOutputFile(output_file4);
-        task5 = grid_workflow->addTask("grid_task5", 500000000000.0, 1, 1, 0);
-        task5->addInputFile(input_file5);
-        task5->addOutputFile(output_file5);
-        task6 = grid_workflow->addTask("grid_task6", 500000000000.0, 1, 1, 0);
-        task6->addInputFile(input_file6);
-        task6->addOutputFile(output_file6);
-        task7 = grid_workflow->addTask("grid_task7", 500000000000.0, 1, 1, 0);
-        task7->addInputFile(input_file7);
-        task7->addOutputFile(output_file7);
-        task8 = grid_workflow->addTask("grid_task8", 500000000000.0, 1, 1, 0);
-        task8->addInputFile(input_file8);
-        task8->addOutputFile(output_file8);
-
-        grid_workflow->addControlDependency(task1, task2);
-        grid_workflow->addControlDependency(task1, task3);
-        grid_workflow->addControlDependency(task1, task4);
-
-        grid_workflow->addControlDependency(task2, task5);
-        grid_workflow->addControlDependency(task3, task6);
-        grid_workflow->addControlDependency(task4, task7);
-
-        grid_workflow->addControlDependency(task5, task8);
-        grid_workflow->addControlDependency(task6, task8);
-        grid_workflow->addControlDependency(task7, task8);
-
-    } else if (ten_split) {
-        input_file2 = grid_workflow->addFile("input_file2", 10000000000.0);
-        output_file2 = grid_workflow->addFile("output_file2", 10000000000.0);
-        input_file3 = grid_workflow->addFile("input_file3", 10000000000.0);
-        output_file3 = grid_workflow->addFile("output_file3", 10000000000.0);
-        input_file4 = grid_workflow->addFile("input_file4", 10000000000.0);
-        output_file4 = grid_workflow->addFile("output_file4", 10000000000.0);
-        input_file5 = grid_workflow->addFile("input_file5", 10000000000.0);
-        output_file5 = grid_workflow->addFile("output_file5", 10000000000.0);
-        input_file6 = grid_workflow->addFile("input_file6", 10000000000.0);
-        output_file6 = grid_workflow->addFile("output_file6", 10000000000.0);
-        input_file7 = grid_workflow->addFile("input_file7", 10000000000.0);
-        output_file7 = grid_workflow->addFile("output_file7", 10000000000.0);
-        input_file8 = grid_workflow->addFile("input_file8", 10000000000.0);
-        output_file8 = grid_workflow->addFile("output_file8", 10000000000.0);
-        input_file9 = grid_workflow->addFile("input_file9", 10000000000.0);
-        output_file9 = grid_workflow->addFile("output_file9", 10000000000.0);
-        input_file10 = grid_workflow->addFile("input_file10", 10000000000.0);
-        output_file10 = grid_workflow->addFile("output_file10", 10000000000.0);
-        input_file11 = grid_workflow->addFile("input_file11", 10000000000.0);
-        output_file11 = grid_workflow->addFile("output_file11", 10000000000.0);
-        input_file12 = grid_workflow->addFile("input_file12", 10000000000.0);
-        output_file12 = grid_workflow->addFile("output_file12", 10000000000.0);
-
-        task2 = grid_workflow->addTask("grid_task2", 500000000000.0, 1, 1, 0);
-        task2->addInputFile(input_file2);
-        task2->addOutputFile(output_file2);
-        task3 = grid_workflow->addTask("grid_task3", 500000000000.0, 1, 1, 0);
-        task3->addInputFile(input_file3);
-        task3->addOutputFile(output_file3);
-        task4 = grid_workflow->addTask("grid_task4", 500000000000.0, 1, 1, 0);
-        task4->addInputFile(input_file4);
-        task4->addOutputFile(output_file4);
-        task5 = grid_workflow->addTask("grid_task5", 500000000000.0, 1, 1, 0);
-        task5->addInputFile(input_file5);
-        task5->addOutputFile(output_file5);
-        task6 = grid_workflow->addTask("grid_task6", 500000000000.0, 1, 1, 0);
-        task6->addInputFile(input_file6);
-        task6->addOutputFile(output_file6);
-        task7 = grid_workflow->addTask("grid_task7", 500000000000.0, 1, 1, 0);
-        task7->addInputFile(input_file7);
-        task7->addOutputFile(output_file7);
-        task8 = grid_workflow->addTask("grid_task8", 500000000000.0, 1, 1, 0);
-        task8->addInputFile(input_file8);
-        task8->addOutputFile(output_file8);
-        task9 = grid_workflow->addTask("grid_task9", 500000000000.0, 1, 1, 0);
-        task9->addInputFile(input_file9);
-        task9->addOutputFile(output_file9);
-        task10 = grid_workflow->addTask("grid_task10", 500000000000.0, 1, 1, 0);
-        task10->addInputFile(input_file10);
-        task10->addOutputFile(output_file10);
-        task11 = grid_workflow->addTask("grid_task11", 500000000000.0, 1, 1, 0);
-        task11->addInputFile(input_file11);
-        task11->addOutputFile(output_file11);
-        task12 = grid_workflow->addTask("grid_task12", 500000000000.0, 1, 1, 0);
-        task12->addInputFile(input_file12);
-        task12->addOutputFile(output_file12);
-
-        grid_workflow->addControlDependency(task1, task2);
-        grid_workflow->addControlDependency(task1, task3);
-        grid_workflow->addControlDependency(task1, task4);
-        grid_workflow->addControlDependency(task1, task5);
-        grid_workflow->addControlDependency(task1, task6);
-        grid_workflow->addControlDependency(task1, task7);
-        grid_workflow->addControlDependency(task1, task8);
-        grid_workflow->addControlDependency(task1, task9);
-        grid_workflow->addControlDependency(task1, task10);
-        grid_workflow->addControlDependency(task1, task11);
-
-        grid_workflow->addControlDependency(task2, task12);
-        grid_workflow->addControlDependency(task3, task12);
-        grid_workflow->addControlDependency(task4, task12);
-        grid_workflow->addControlDependency(task5, task12);
-        grid_workflow->addControlDependency(task6, task12);
-        grid_workflow->addControlDependency(task7, task12);
-        grid_workflow->addControlDependency(task8, task12);
-        grid_workflow->addControlDependency(task9, task12);
-        grid_workflow->addControlDependency(task10, task12);
-        grid_workflow->addControlDependency(task11, task12);
-    } else if (three_task){
-        input_file2 = grid_workflow->addFile("input_file2", 10000000000.0);
-        output_file2 = grid_workflow->addFile("output_file2", 10000000000.0);
-        input_file3 = grid_workflow->addFile("input_file3", 10000000000.0);
-        output_file3 = grid_workflow->addFile("output_file3", 10000000000.0);
-
-        task2 = grid_workflow->addTask("grid_task2", 500000000000.0, 1, 1, 0);
-        task2->addInputFile(input_file2);
-        task2->addOutputFile(output_file2);
-        task3 = grid_workflow->addTask("grid_task3", 500000000000.0, 1, 1, 0);
-        task3->addInputFile(input_file3);
-        task3->addOutputFile(output_file3);
-
-        grid_workflow->addControlDependency(task1,task2);
-        grid_workflow->addControlDependency(task2,task3);
-    } else if (join_merge_join_merge) {
-        input_file2 = grid_workflow->addFile("input_file2", 10000000000.0);
-        output_file2 = grid_workflow->addFile("output_file2", 10000000000.0);
-        input_file3 = grid_workflow->addFile("input_file3", 10000000000.0);
-        output_file3 = grid_workflow->addFile("output_file3", 10000000000.0);
-        input_file4 = grid_workflow->addFile("input_file4", 10000000000.0);
-        output_file4 = grid_workflow->addFile("output_file4", 10000000000.0);
-        input_file5 = grid_workflow->addFile("input_file5", 10000000000.0);
-        output_file5 = grid_workflow->addFile("output_file5", 10000000000.0);
-        input_file6 = grid_workflow->addFile("input_file6", 10000000000.0);
-        output_file6 = grid_workflow->addFile("output_file6", 10000000000.0);
-        input_file7 = grid_workflow->addFile("input_file7", 10000000000.0);
-        output_file7 = grid_workflow->addFile("output_file7", 10000000000.0);
-        input_file8 = grid_workflow->addFile("input_file8", 10000000000.0);
-        output_file8 = grid_workflow->addFile("output_file8", 10000000000.0);
-        input_file9 = grid_workflow->addFile("input_file9", 10000000000.0);
-        output_file9 = grid_workflow->addFile("output_file9", 10000000000.0);
-        input_file10 = grid_workflow->addFile("input_file10", 10000000000.0);
-        output_file10 = grid_workflow->addFile("output_file10", 10000000000.0);
-        input_file11 = grid_workflow->addFile("input_file11", 10000000000.0);
-        output_file11 = grid_workflow->addFile("output_file11", 10000000000.0);
-        input_file12 = grid_workflow->addFile("input_file12", 10000000000.0);
-        output_file12 = grid_workflow->addFile("output_file12", 10000000000.0);
-        input_file13 = grid_workflow->addFile("input_file13", 10000000000.0);
-        output_file13 = grid_workflow->addFile("output_file13", 10000000000.0);
-
-
-        task2 = grid_workflow->addTask("grid_task2", 500000000000.0, 1, 1, 0);
-        task2->addInputFile(input_file2);
-        task2->addOutputFile(output_file2);
-        task3 = grid_workflow->addTask("grid_task3", 500000000000.0, 1, 1, 0);
-        task3->addInputFile(input_file3);
-        task3->addOutputFile(output_file3);
-        task4 = grid_workflow->addTask("grid_task4", 500000000000.0, 1, 1, 0);
-        task4->addInputFile(input_file4);
-        task4->addOutputFile(output_file4);
-        task5 = grid_workflow->addTask("grid_task5", 500000000000.0, 1, 1, 0);
-        task5->addInputFile(input_file5);
-        task5->addOutputFile(output_file5);
-        task6 = grid_workflow->addTask("grid_task6", 500000000000.0, 1, 1, 0);
-        task6->addInputFile(input_file6);
-        task6->addOutputFile(output_file6);
-        task7 = grid_workflow->addTask("grid_task7", 500000000000.0, 1, 1, 0);
-        task7->addInputFile(input_file7);
-        task7->addOutputFile(output_file7);
-        task8 = grid_workflow->addTask("grid_task8", 500000000000.0, 1, 1, 0);
-        task8->addInputFile(input_file8);
-        task8->addOutputFile(output_file8);
-        task9 = grid_workflow->addTask("grid_task9", 500000000000.0, 1, 1, 0);
-        task9->addInputFile(input_file9);
-        task9->addOutputFile(output_file9);
-        task10 = grid_workflow->addTask("grid_task10", 500000000000.0, 1, 1, 0);
-        task10->addInputFile(input_file10);
-        task10->addOutputFile(output_file10);
-        task11 = grid_workflow->addTask("grid_task11", 500000000000.0, 1, 1, 0);
-        task11->addInputFile(input_file11);
-        task11->addOutputFile(output_file11);
-        task12 = grid_workflow->addTask("grid_task12", 500000000000.0, 1, 1, 0);
-        task12->addInputFile(input_file12);
-        task12->addOutputFile(output_file12);
-        task13 = grid_workflow->addTask("grid_task13", 500000000000.0, 1, 1, 0);
-        task13->addInputFile(input_file13);
-        task13->addOutputFile(output_file13);
-
-        grid_workflow->addControlDependency(task1, task2);
-        grid_workflow->addControlDependency(task1, task3);
-        grid_workflow->addControlDependency(task1, task4);
-        grid_workflow->addControlDependency(task1, task5);
-        grid_workflow->addControlDependency(task1, task6);
-
-        grid_workflow->addControlDependency(task2, task7);
-        grid_workflow->addControlDependency(task3, task7);
-        grid_workflow->addControlDependency(task4, task7);
-        grid_workflow->addControlDependency(task5, task7);
-        grid_workflow->addControlDependency(task6, task7);
-
-        grid_workflow->addControlDependency(task7, task8);
-        grid_workflow->addControlDependency(task7, task9);
-        grid_workflow->addControlDependency(task7, task10);
-        grid_workflow->addControlDependency(task7, task11);
-        grid_workflow->addControlDependency(task7, task12);
-
-        grid_workflow->addControlDependency(task8, task13);
-        grid_workflow->addControlDependency(task9, task13);
-        grid_workflow->addControlDependency(task10, task13);
-        grid_workflow->addControlDependency(task11, task13);
-        grid_workflow->addControlDependency(task12, task13);
-    } else if (three_four_split) {
-        input_file2 = grid_workflow->addFile("input_file2", 10000000000.0);
-        output_file2 = grid_workflow->addFile("output_file2", 10000000000.0);
-        input_file3 = grid_workflow->addFile("input_file3", 10000000000.0);
-        output_file3 = grid_workflow->addFile("output_file3", 10000000000.0);
-        input_file4 = grid_workflow->addFile("input_file4", 10000000000.0);
-        output_file4 = grid_workflow->addFile("output_file4", 10000000000.0);
-        input_file5 = grid_workflow->addFile("input_file5", 10000000000.0);
-        output_file5 = grid_workflow->addFile("output_file5", 10000000000.0);
-        input_file6 = grid_workflow->addFile("input_file6", 10000000000.0);
-        output_file6 = grid_workflow->addFile("output_file6", 10000000000.0);
-        input_file7 = grid_workflow->addFile("input_file7", 10000000000.0);
-        output_file7 = grid_workflow->addFile("output_file7", 10000000000.0);
-        input_file8 = grid_workflow->addFile("input_file8", 10000000000.0);
-        output_file8 = grid_workflow->addFile("output_file8", 10000000000.0);
-        input_file9 = grid_workflow->addFile("input_file9", 10000000000.0);
-        output_file9 = grid_workflow->addFile("output_file9", 10000000000.0);
-        input_file10 = grid_workflow->addFile("input_file10", 10000000000.0);
-        output_file10 = grid_workflow->addFile("output_file10", 10000000000.0);
-        input_file11 = grid_workflow->addFile("input_file11", 10000000000.0);
-        output_file11 = grid_workflow->addFile("output_file11", 10000000000.0);
-        input_file12 = grid_workflow->addFile("input_file12", 10000000000.0);
-        output_file12 = grid_workflow->addFile("output_file12", 10000000000.0);
-        input_file13 = grid_workflow->addFile("input_file13", 10000000000.0);
-        output_file13 = grid_workflow->addFile("output_file13", 10000000000.0);
-        input_file14 = grid_workflow->addFile("input_file14", 10000000000.0);
-        output_file14 = grid_workflow->addFile("output_file14", 10000000000.0);
-        input_file15 = grid_workflow->addFile("input_file15", 10000000000.0);
-        output_file15 = grid_workflow->addFile("output_file15", 10000000000.0);
-        input_file16 = grid_workflow->addFile("input_file16", 10000000000.0);
-        output_file16 = grid_workflow->addFile("output_file16", 10000000000.0);
-        input_file17 = grid_workflow->addFile("input_file17", 10000000000.0);
-        output_file17 = grid_workflow->addFile("output_file17", 10000000000.0);
-
-        task2 = grid_workflow->addTask("grid_task2", 500000000000.0, 1, 1, 0);
-        task2->addInputFile(input_file2);
-        task2->addOutputFile(output_file2);
-        task3 = grid_workflow->addTask("grid_task3", 500000000000.0, 1, 1, 0);
-        task3->addInputFile(input_file3);
-        task3->addOutputFile(output_file3);
-        task4 = grid_workflow->addTask("grid_task4", 500000000000.0, 1, 1, 0);
-        task4->addInputFile(input_file4);
-        task4->addOutputFile(output_file4);
-        task5 = grid_workflow->addTask("grid_task5", 500000000000.0, 1, 1, 0);
-        task5->addInputFile(input_file5);
-        task5->addOutputFile(output_file5);
-        task6 = grid_workflow->addTask("grid_task6", 500000000000.0, 1, 1, 0);
-        task6->addInputFile(input_file6);
-        task6->addOutputFile(output_file6);
-        task7 = grid_workflow->addTask("grid_task7", 500000000000.0, 1, 1, 0);
-        task7->addInputFile(input_file7);
-        task7->addOutputFile(output_file7);
-        task8 = grid_workflow->addTask("grid_task8", 500000000000.0, 1, 1, 0);
-        task8->addInputFile(input_file8);
-        task8->addOutputFile(output_file8);
-        task9 = grid_workflow->addTask("grid_task9", 500000000000.0, 1, 1, 0);
-        task9->addInputFile(input_file9);
-        task9->addOutputFile(output_file9);
-        task10 = grid_workflow->addTask("grid_task10", 500000000000.0, 1, 1, 0);
-        task10->addInputFile(input_file10);
-        task10->addOutputFile(output_file10);
-        task11 = grid_workflow->addTask("grid_task11", 500000000000.0, 1, 1, 0);
-        task11->addInputFile(input_file11);
-        task11->addOutputFile(output_file11);
-        task12 = grid_workflow->addTask("grid_task12", 500000000000.0, 1, 1, 0);
-        task12->addInputFile(input_file12);
-        task12->addOutputFile(output_file12);
-        task13 = grid_workflow->addTask("grid_task13", 500000000000.0, 1, 1, 0);
-        task13->addInputFile(input_file13);
-        task13->addOutputFile(output_file13);
-        task14 = grid_workflow->addTask("grid_task14", 500000000000.0, 1, 1, 0);
-        task14->addInputFile(input_file14);
-        task14->addOutputFile(output_file14);
-        task15 = grid_workflow->addTask("grid_task15", 500000000000.0, 1, 1, 0);
-        task15->addInputFile(input_file15);
-        task15->addOutputFile(output_file15);
-        task16 = grid_workflow->addTask("grid_task16", 500000000000.0, 1, 1, 0);
-        task16->addInputFile(input_file16);
-        task16->addOutputFile(output_file16);
-        task17 = grid_workflow->addTask("grid_task17", 500000000000.0, 1, 1, 0);
-        task17->addInputFile(input_file17);
-        task17->addOutputFile(output_file17);
-
-
-        grid_workflow->addControlDependency(task1, task2);
-        grid_workflow->addControlDependency(task1, task3);
-        grid_workflow->addControlDependency(task1, task4);
-
-        grid_workflow->addControlDependency(task2, task5);
-        grid_workflow->addControlDependency(task2, task6);
-        grid_workflow->addControlDependency(task2, task7);
-        grid_workflow->addControlDependency(task2, task8);
-
-        grid_workflow->addControlDependency(task3, task9);
-        grid_workflow->addControlDependency(task3, task10);
-        grid_workflow->addControlDependency(task3, task11);
-        grid_workflow->addControlDependency(task3, task12);
-
-        grid_workflow->addControlDependency(task4, task13);
-        grid_workflow->addControlDependency(task4, task14);
-        grid_workflow->addControlDependency(task4, task15);
-        grid_workflow->addControlDependency(task4, task16);
-
-        grid_workflow->addControlDependency(task5, task17);
-        grid_workflow->addControlDependency(task6, task17);
-        grid_workflow->addControlDependency(task7, task17);
-        grid_workflow->addControlDependency(task8, task17);
-        grid_workflow->addControlDependency(task9, task17);
-        grid_workflow->addControlDependency(task10, task17);
-        grid_workflow->addControlDependency(task11, task17);
-        grid_workflow->addControlDependency(task12, task17);
-        grid_workflow->addControlDependency(task13, task17);
-        grid_workflow->addControlDependency(task14, task17);
-        grid_workflow->addControlDependency(task15, task17);
-        grid_workflow->addControlDependency(task16, task17);
-    } else if (genome) {
-        grid_workflow = wrench::PegasusWorkflowParser::createWorkflowFromJSON("genome.json", "2000000000f", false);
-    } else if (montage) {
-        grid_workflow = wrench::PegasusWorkflowParser::createWorkflowFromJSON("montage.json", "2000000000f", false);
-    } else if (montage_4) {
-        grid_workflow = wrench::PegasusWorkflowParser::createWorkflowFromJSON("montage_4.json", "2000000000f", false);
-    } else if (montage_8) {
-        grid_workflow = wrench::PegasusWorkflowParser::createWorkflowFromJSON("montage_8.json", "2000000000f", false);
-    } else if (montage_16) {
-        grid_workflow = wrench::PegasusWorkflowParser::createWorkflowFromJSON("montage_16.json", "2000000000f", false);
-    }
-
-    // Create a Storage Service
-    storage_service = simulation->add(
-            new wrench::SimpleStorageService(hostname, {"/"}));
-
-    //storage_service2 = simulation->add(
-    //       new wrench::SimpleStorageService(batchhostname, {"/"})));
-
-    // Create list of compute services
-    std::set<wrench::ComputeService *> compute_services;
-    std::string execution_host = wrench::Simulation::getHostnameList()[num_hosts+1];
-
-
-    vector<std::string> worker_hosts;
-    for(int i=0;i<num_hosts;i++){
-        worker_hosts.push_back("slurm_worker_"+std::to_string(i));
-    }
-
-
-    std::vector<std::string> execution_hosts;
-    execution_hosts.push_back(execution_host);
-    compute_services.insert(new wrench::BareMetalComputeService(
-            execution_host,
-            {std::make_pair(
-                    execution_host,
-                    std::make_tuple(wrench::Simulation::getHostNumCores(execution_host),
-                                    wrench::Simulation::getHostMemoryCapacity(execution_host)))},
-            "/scratch"));
-
-    wrench::BatchComputeService *batch_service = nullptr;
-
-
-
-    if(argc>3){
-        batch_service = new wrench::BatchComputeService("slurm_worker_0",
-                                                             worker_hosts,
-                                                             "/scratch",
-                                                             {
-                                                                     {wrench::BatchComputeServiceProperty::SUPPORTS_GRID_UNIVERSE, "true"},
-                                                                     {wrench::BatchComputeServiceProperty::GRID_PRE_EXECUTION_DELAY, std::to_string(pre_execution_overhead)},
-                                                                     {wrench::BatchComputeServiceProperty::GRID_POST_EXECUTION_DELAY, std::to_string(post_execution_overhead)},
-                                                                     {wrench::BatchComputeServiceProperty::TASK_STARTUP_OVERHEAD, std::to_string(per_task_overhead)}
-                                                             });
-    } else {
-        batch_service = new wrench::BatchComputeService("slurm_worker_0",
-                                                             worker_hosts,
-                                                             "/scratch",
-                                                             {
-                                                                     {wrench::BatchComputeServiceProperty::SUPPORTS_GRID_UNIVERSE, "true"},
-                                                             });
-    }
-
+    // Create a HTCondor Service, that can use the batch service and runs on the
+    // Cluster Head Node
 
+    std::set<wrench::ComputeService *> condor_compute_resources;
+    condor_compute_resources.insert(batch_cs);
 
-    // Create a HTCondor Service
-    compute_service = simulation->add(
+    auto htcondor_cs =
             new wrench::HTCondorComputeService(
-                    hostname, "local", std::move(compute_services),
+                    "BatchHeadNode", "mypool", std::move(condor_compute_resources),
                     {
                             {wrench::HTCondorComputeServiceProperty::SUPPORTS_PILOT_JOBS, "false"},
                             {wrench::HTCondorComputeServiceProperty::SUPPORTS_STANDARD_JOBS, "true"},
diff --git a/examples/condor-grid-example/condor_grid.xml b/examples/condor-grid-example/condor_grid.xml
deleted file mode 100644
index 0929104504..0000000000
--- a/examples/condor-grid-example/condor_grid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4.1">
-<zone id="AS0" routing="Full">
-<host id="DualCoreHost" speed="1f" core="2" >
-<disk id="large_disk" read_bw="100MBps" write_bw="100MBps">
-<prop id="size" value="100GB"/>
-<prop id="mount" value="/"/>
-</disk>
-<disk id="scratch" read_bw="100MBps" write_bw="100MBps">
-<prop id="size" value="1000000GB"/>
-<prop id="mount" value="/scratch"/>
-</disk>
-</host>
-<host id="QuadCoreHost" speed="1f" core="4" >
-<disk id="large_disk" read_bw="100MBps" write_bw="100MBps">
-<prop id="size" value="100GB"/>
-<prop id="mount" value="/"/>
-</disk>
-<disk id="scratch" read_bw="100MBps" write_bw="100MBps">
-<prop id="size" value="1000000GB"/>
-<prop id="mount" value="/scratch"/>
-</disk>
-</host>
-<host id="BatchHost1" speed="3050000000f" core="10">
-<disk id="large_disk" read_bw="100MBps" write_bw="100MBps">
-<prop id="size" value="100GB"/>
-<prop id="mount" value="/"/>
-</disk>
-<disk id="scratch" read_bw="100MBps" write_bw="100MBps">
-<prop id="size" value="1000000GB"/>
-<prop id="mount" value="/scratch"/>
-</disk>
-</host>
-<host id="BatchHost2" speed="3050000000f" core="10">
-<disk id="large_disk" read_bw="100MBps" write_bw="100MBps">
-<prop id="size" value="100GB"/>
-<prop id="mount" value="/"/>
-</disk>
-<disk id="scratch" read_bw="100MBps" write_bw="100MBps">
-<prop id="size" value="1000000GB"/>
-<prop id="mount" value="/scratch"/>
-</disk>
-</host>
-<link id="1" bandwidth="5000GBps" latency="0us"/>
-<link id="2" bandwidth="5000GBps" latency="0us"/>
-<link id="3" bandwidth="5000GBps" latency="0us"/>
-<link id="4" bandwidth="5000GBps" latency="0us"/>
-<link id="5" bandwidth="5000GBps" latency="0us"/>
-<link id="6" bandwidth="5000GBps" latency="0us"/>
-<route src="DualCoreHost" dst="QuadCoreHost"> <link_ctn id="1"/> </route>
-<route src="BatchHost1" dst="BatchHost2"> <link_ctn id="2"/> </route>
-<route src="DualCoreHost" dst="BatchHost1"> <link_ctn id="3"/> </route>
-<route src="DualCoreHost" dst="BatchHost2"> <link_ctn id="4"/> </route>
-<route src="QuadCoreHost" dst="BatchHost1"> <link_ctn id="5"/> </route>
-<route src="QuadCoreHost" dst="BatchHost2"> <link_ctn id="6"/> </route>
-</zone>
-</platform>
\ No newline at end of file