sst.sandia.gov subpages point to old unused urls
Google searching for various sst tools (for example dumpi) takes the user to subpages of the sst.sandia.gov site.  The top page tells the user to goto sst-simulator.org, but there are direct links on the sidebar and subpages which have obsolete information (see http://sst.sandia.gov/about_core.html).

These pages and website needs to be revamped.

diff --git a/src/sst/elements/ember/test/defaultParams.py b/src/sst/elements/ember/test/defaultParams.py
index c70147f2c..2eb9a8808 100644
--- a/src/sst/elements/ember/test/defaultParams.py
+++ b/src/sst/elements/ember/test/defaultParams.py
@@ -11,7 +11,8 @@ networkParams = {
     "input_latency" : "50ns",
     "output_latency" : "50ns",
     "flitSize" : "8B",
-    "buffer_size" : "14KB",
+    "input_buf_size" : "14KB",
+    "output_buf_size" : "14KB",
 }
 
 nicParams = {
@@ -19,7 +20,8 @@ nicParams = {
     "module" : "merlin.linkcontrol",
     "packetSize" : networkParams['packetSize'],
     "link_bw" : networkParams['link_bw'],
-    "buffer_size" : networkParams['buffer_size'],
+    "input_buf_size" : networkParams['input_buf_size'],
+    "output_buf_size" : networkParams['output_buf_size'],
     "rxMatchDelay_ns" : 100,
     "txDelay_ns" : 50,
     "nic2host_lat" : "150ns",
diff --git a/src/sst/elements/ember/test/emberLoad.py b/src/sst/elements/ember/test/emberLoad.py
index 3501b60ae..64872ed67 100644
--- a/src/sst/elements/ember/test/emberLoad.py
+++ b/src/sst/elements/ember/test/emberLoad.py
@@ -341,8 +341,8 @@ sst.merlin._params["xbar_bw"] = networkParams['link_bw']
 sst.merlin._params["flit_size"] = networkParams['flitSize'] 
 sst.merlin._params["input_latency"] = networkParams['input_latency'] 
 sst.merlin._params["output_latency"] = networkParams['output_latency'] 
-sst.merlin._params["input_buf_size"] = networkParams['buffer_size'] 
-sst.merlin._params["output_buf_size"] = networkParams['buffer_size'] 
+sst.merlin._params["input_buf_size"] = networkParams['input_buf_size'] 
+sst.merlin._params["output_buf_size"] = networkParams['output_buf_size'] 
 
 if "network_inspectors" in networkParams.keys():
     sst.merlin._params["network_inspectors"] = networkParams['network_inspectors']
diff --git a/src/sst/elements/ember/tests/refFiles/ESshmem_cumulative.out b/src/sst/elements/ember/tests/refFiles/ESshmem_cumulative.out
index 4f4b76a2f..8490f3c2c 100644
--- a/src/sst/elements/ember/tests/refFiles/ESshmem_cumulative.out
+++ b/src/sst/elements/ember/tests/refFiles/ESshmem_cumulative.out
@@ -1,40 +1,40 @@
-20e886bfb7e3fea793bf0029e431d1a7 Simulation is complete, simulated time: 201.448 us
+20e886bfb7e3fea793bf0029e431d1a7 Simulation is complete, simulated time: 201.446 us
 c4a74c672da38bc35a2cb3480313498d Simulation is complete, simulated time: 551.202 us
-5f6021f216b371bf4d4834218ce3f1bb Simulation is complete, simulated time: 172.836 us
+5f6021f216b371bf4d4834218ce3f1bb Simulation is complete, simulated time: 172.834 us
 6eec970b3269d9eb2be6c4f09a9d9080 Simulation is complete, simulated time: 380.734 us
-e8cdf1a1a4aa5a7749048c7dcf67ca6a Simulation is complete, simulated time: 6.995 us
-f4b15be14bba163dcb2e4b642a8e3c6b Simulation is complete, simulated time: 24.061 us
-4235171596788b842de423b0460c86bf Simulation is complete, simulated time: 32.559 us
-50014f8db405b6e51a00abfe86d18a1d Simulation is complete, simulated time: 6.995 us
-1ac054980eba5eb13f6207cbeb051ec1 Simulation is complete, simulated time: 24.061 us
-99228b3dadbc45188e37e3b75ca6ce2c Simulation is complete, simulated time: 36.668 us
+e8cdf1a1a4aa5a7749048c7dcf67ca6a Simulation is complete, simulated time: 6.993 us
+f4b15be14bba163dcb2e4b642a8e3c6b Simulation is complete, simulated time: 24.211 us
+4235171596788b842de423b0460c86bf Simulation is complete, simulated time: 32.649 us
+50014f8db405b6e51a00abfe86d18a1d Simulation is complete, simulated time: 6.993 us
+1ac054980eba5eb13f6207cbeb051ec1 Simulation is complete, simulated time: 23.995 us
+99228b3dadbc45188e37e3b75ca6ce2c Simulation is complete, simulated time: 36.952 us
 56897b7251e2e665f33199f82e1e266f Simulation is complete, simulated time: 8.779 us
-23059a7933b94bb77d0d8cfa22e0aa4e Simulation is complete, simulated time: 6.995 us
-063af3e51e2f826e19f23ff10b4c5f18 Simulation is complete, simulated time: 24.061 us
-956cd31d0521f9dcaba85af469a68d12 Simulation is complete, simulated time: 1.19573 ms
-d1beb5787ff77daf730c9daae83ede51 Simulation is complete, simulated time: 1.26943 ms
-05ae92ecd0fa12d89b96b8fbfffbe178 Simulation is complete, simulated time: 1.26662 ms
-b13fd8d32deb6af396771612e8dcbc6a Simulation is complete, simulated time: 115.133 us
-bfcbcc3439246ee8bb3b9e1416b023b5 Simulation is complete, simulated time: 6.995 us
-96ef09125604ac671e202d0381740c25 Simulation is complete, simulated time: 24.061 us
-63c2acc33f4874da276c95f2347fac8d Simulation is complete, simulated time: 1.26943 ms
-523b7c722410ba2b98dcc36846ff5314 Simulation is complete, simulated time: 1.38789 ms
-1d9cb27f2056df62e8aedc95fdf7796c Simulation is complete, simulated time: 1.38513 ms
-ab1add1f35f90727eea910bf7e0f81b9 Simulation is complete, simulated time: 115.133 us
-2de75935ea9979e9394f939a035740ce Simulation is complete, simulated time: 5.506 us
+23059a7933b94bb77d0d8cfa22e0aa4e Simulation is complete, simulated time: 6.993 us
+063af3e51e2f826e19f23ff10b4c5f18 Simulation is complete, simulated time: 24.211 us
+956cd31d0521f9dcaba85af469a68d12 Simulation is complete, simulated time: 1.19508 ms
+d1beb5787ff77daf730c9daae83ede51 Simulation is complete, simulated time: 1.26812 ms
+05ae92ecd0fa12d89b96b8fbfffbe178 Simulation is complete, simulated time: 1.26591 ms
+b13fd8d32deb6af396771612e8dcbc6a Simulation is complete, simulated time: 114.801 us
+bfcbcc3439246ee8bb3b9e1416b023b5 Simulation is complete, simulated time: 6.993 us
+96ef09125604ac671e202d0381740c25 Simulation is complete, simulated time: 23.995 us
+63c2acc33f4874da276c95f2347fac8d Simulation is complete, simulated time: 1.26857 ms
+523b7c722410ba2b98dcc36846ff5314 Simulation is complete, simulated time: 1.38647 ms
+1d9cb27f2056df62e8aedc95fdf7796c Simulation is complete, simulated time: 1.384 ms
+ab1add1f35f90727eea910bf7e0f81b9 Simulation is complete, simulated time: 114.835 us
+2de75935ea9979e9394f939a035740ce Simulation is complete, simulated time: 5.504 us
 0deb75644ef4c5b55526ea13acac9ddf Simulation is complete, simulated time: 12.664 us
-d6c2fbe70743ecc9031e38e09cafaa6e Simulation is complete, simulated time: 5.502 us
+d6c2fbe70743ecc9031e38e09cafaa6e Simulation is complete, simulated time: 5.5 us
 caeb6c8c3f6fd743b585740f6e3d9061 Simulation is complete, simulated time: 12.648 us
-7fca3bd3526e00cdad7d54637acf2f39 Simulation is complete, simulated time: 8.359 us
-392adc0ace3695154d667a5058987354 Simulation is complete, simulated time: 56.887 us
+7fca3bd3526e00cdad7d54637acf2f39 Simulation is complete, simulated time: 8.349 us
+392adc0ace3695154d667a5058987354 Simulation is complete, simulated time: 56.637 us
 11fa136c6e5730f03f97c2df2ac025ce Simulation is complete, simulated time: 57.507 us
-1f0d8f7ed71092af5eb66728d370ae38 Simulation is complete, simulated time: 8.359 us
-b357e0efaecab3d206b4f8d3cb2c7dd4 Simulation is complete, simulated time: 56.887 us
-bf02d08d8b5b22aa1099cd3467706e85 Simulation is complete, simulated time: 62.511 us
-90c12d7662800886091a47fbdfde7163 Simulation is complete, simulated time: 7.526 us
+1f0d8f7ed71092af5eb66728d370ae38 Simulation is complete, simulated time: 8.351 us
+b357e0efaecab3d206b4f8d3cb2c7dd4 Simulation is complete, simulated time: 56.701 us
+bf02d08d8b5b22aa1099cd3467706e85 Simulation is complete, simulated time: 61.533 us
+90c12d7662800886091a47fbdfde7163 Simulation is complete, simulated time: 7.524 us
 3baeef25ec6a74a92ea77394b2352c73 Simulation is complete, simulated time: 60.744 us
 069e097dc752bdd149b0030377dcd9cc Simulation is complete, simulated time: 61.62 us
-7c2b015c842bda7609bdd3cd3c39d0ba Simulation is complete, simulated time: 7.526 us
+7c2b015c842bda7609bdd3cd3c39d0ba Simulation is complete, simulated time: 7.524 us
 f55df8a1f4a9fcd6e2b04035137cf354 Simulation is complete, simulated time: 60.744 us
 5dd729022a960da0a9ac163d18f88184 Simulation is complete, simulated time: 62.518 us
 c7baae57caeb4b68703225f0a81f71a8 Simulation is complete, simulated time: 5.388 us
@@ -47,42 +47,42 @@ ce495bcfcdec30c37bf956ac9237b5bb Simulation is complete, simulated time: 5.388 u
 65457bdb91c90a0d5994093f1a032f42 Simulation is complete, simulated time: 5.388 us
 f0cad1d67e4c255cb2d1f426b6806371 Simulation is complete, simulated time: 5.388 us
 8b99377ee1e99b887a79e8dd95ba0e14 Simulation is complete, simulated time: 5.392 us
-762328d5d6adafa312ab9c649cfd1aea Simulation is complete, simulated time: 6.974 us
-8a1e3d64ded1d806a170e903521591f4 Simulation is complete, simulated time: 5.488 us
+762328d5d6adafa312ab9c649cfd1aea Simulation is complete, simulated time: 6.972 us
+8a1e3d64ded1d806a170e903521591f4 Simulation is complete, simulated time: 5.482 us
 5e38fd7d5d594679d887fee9728e4435 Simulation is complete, simulated time: 3.671 us
 641335334c8a3f637d657906f3a7c10e Simulation is complete, simulated time: 3.671 us
 166e5a405187a3cd2672bd9f9e230636 Simulation is complete, simulated time: 3.671 us
 bbf096f5c13274e454d1071a21be1ff0 Simulation is complete, simulated time: 3.671 us
 03b39041a6953d56d4ab3ed44d3d808f Simulation is complete, simulated time: 4.35 us
 43349e16f8d84e6d6be356c0e295dcc2 Simulation is complete, simulated time: 4.35 us
-1d4b31a6677748ed649a0dad981f44f1 Simulation is complete, simulated time: 4.712 us
+1d4b31a6677748ed649a0dad981f44f1 Simulation is complete, simulated time: 4.714 us
 5889dd20792ae804f6621a40ce618990 Simulation is complete, simulated time: 4.35 us
 dd79e49a68939928072188bba6f57249 Simulation is complete, simulated time: 5.056 us
 fed6c149bcf87264b06fe224e59e1e9d Simulation is complete, simulated time: 5.056 us
 ca0d18bb4120ac55076dc8e06162eace Simulation is complete, simulated time: 5.056 us
 67512825a65816363335bd86cd23044f Simulation is complete, simulated time: 5.056 us
-cf6baf07c1dc268f5a18c56cea05a7c0 Simulation is complete, simulated time: 8.455 us
-e800535bfb11bef3874730b4031b2f5a Simulation is complete, simulated time: 8.455 us
-7dc7594c195ea2175045f2cde4305e03 Simulation is complete, simulated time: 8.455 us
-447d697538f54ab583eaf945c6fcec67 Simulation is complete, simulated time: 8.455 us
-380531d42f55da530db1700f3ca56e53 Simulation is complete, simulated time: 8.455 us
-5999458e5744c2ef1c5e093052167909 Simulation is complete, simulated time: 8.455 us
-dce10c52a0044b4bbe8b8156a54f9abb Simulation is complete, simulated time: 8.455 us
-0ec0a744056ca006c3c32d1713e37bc4 Simulation is complete, simulated time: 8.459 us
-79bb3f25e52aa82a26a5c8f0f2220f78 Simulation is complete, simulated time: 8.459 us
-9568ccf105c1194097791b215b5f9ce3 Simulation is complete, simulated time: 8.459 us
-db2fd0c64381e8be1bb1c5833c5565a9 Simulation is complete, simulated time: 8.459 us
-d9aa42f978cd1b02745830c0278eb1ac Simulation is complete, simulated time: 8.459 us
-bfcc8f71df02f5fcff4dbf5884502821 Simulation is complete, simulated time: 8.459 us
-4a11045ae8800841eb55287da0c1a526 Simulation is complete, simulated time: 8.459 us
-5ae0e0bbb821c1d28bb75cf85016a3aa Simulation is complete, simulated time: 10.175 us
-e016c98b90ae3b39114dd9b6a7db202a Simulation is complete, simulated time: 10.175 us
-03f2b1fed5dcd9847a701237c754249a Simulation is complete, simulated time: 10.175 us
-b5107315bd48cb43a7823762ebb9531b Simulation is complete, simulated time: 10.175 us
-ccf9f70aca6488302d4eed5048e105b1 Simulation is complete, simulated time: 10.083 us
-5de6e46cda20c5f0703812b2ad16ce00 Simulation is complete, simulated time: 10.083 us
-313eaa178de1b726836e6607cf248d41 Simulation is complete, simulated time: 10.083 us
-719e71be0c765f6ec685a849231a7e28 Simulation is complete, simulated time: 10.083 us
+cf6baf07c1dc268f5a18c56cea05a7c0 Simulation is complete, simulated time: 8.453 us
+e800535bfb11bef3874730b4031b2f5a Simulation is complete, simulated time: 8.453 us
+7dc7594c195ea2175045f2cde4305e03 Simulation is complete, simulated time: 8.453 us
+447d697538f54ab583eaf945c6fcec67 Simulation is complete, simulated time: 8.453 us
+380531d42f55da530db1700f3ca56e53 Simulation is complete, simulated time: 8.453 us
+5999458e5744c2ef1c5e093052167909 Simulation is complete, simulated time: 8.453 us
+dce10c52a0044b4bbe8b8156a54f9abb Simulation is complete, simulated time: 8.453 us
+0ec0a744056ca006c3c32d1713e37bc4 Simulation is complete, simulated time: 8.457 us
+79bb3f25e52aa82a26a5c8f0f2220f78 Simulation is complete, simulated time: 8.457 us
+9568ccf105c1194097791b215b5f9ce3 Simulation is complete, simulated time: 8.457 us
+db2fd0c64381e8be1bb1c5833c5565a9 Simulation is complete, simulated time: 8.457 us
+d9aa42f978cd1b02745830c0278eb1ac Simulation is complete, simulated time: 8.457 us
+bfcc8f71df02f5fcff4dbf5884502821 Simulation is complete, simulated time: 8.457 us
+4a11045ae8800841eb55287da0c1a526 Simulation is complete, simulated time: 8.457 us
+5ae0e0bbb821c1d28bb75cf85016a3aa Simulation is complete, simulated time: 10.173 us
+e016c98b90ae3b39114dd9b6a7db202a Simulation is complete, simulated time: 10.173 us
+03f2b1fed5dcd9847a701237c754249a Simulation is complete, simulated time: 10.173 us
+b5107315bd48cb43a7823762ebb9531b Simulation is complete, simulated time: 10.173 us
+ccf9f70aca6488302d4eed5048e105b1 Simulation is complete, simulated time: 10.077 us
+5de6e46cda20c5f0703812b2ad16ce00 Simulation is complete, simulated time: 10.077 us
+313eaa178de1b726836e6607cf248d41 Simulation is complete, simulated time: 10.077 us
+719e71be0c765f6ec685a849231a7e28 Simulation is complete, simulated time: 10.077 us
 825f62f6f600ba298326bdf69b5f52a4 Simulation is complete, simulated time: 5.388 us
 4235c525fdbab9153eb7a4056f9aab07 Simulation is complete, simulated time: 5.388 us
 31e15481b0a69e931f817a611bd186b4 Simulation is complete, simulated time: 3.134 us
@@ -115,12 +115,12 @@ bed45b3470382f1633ba6b99cf77d9be Simulation is complete, simulated time: 94.068
 d6dd2c35563417f4fb945ad3362ecb9c Simulation is complete, simulated time: 5.141 us
 afa5982dcb8f084e23018629634732e0 Simulation is complete, simulated time: 16.381 us
 3c1a798313220a6f398fa72fb7663254 Simulation is complete, simulated time: 4.383 us
-c1ca0f5826a8e5131964e070672cab0f Simulation is complete, simulated time: 54.037 us
+c1ca0f5826a8e5131964e070672cab0f Simulation is complete, simulated time: 52.087 us
 cec2296f0ac1370617d72b0db25e346b Simulation is complete, simulated time: 61.653 us
-5a845c05ec78a9ac364731f4a22f30fb Simulation is complete, simulated time: 2.76592 ms
+5a845c05ec78a9ac364731f4a22f30fb Simulation is complete, simulated time: 2.7662 ms
 80279cde7618ffd8b5073c4e05da2dee Simulation is complete, simulated time: 3.372 us
 8609806b1ae1fe8e47f90ca7e608785f Simulation is complete, simulated time: 12.662 us
 07c8fcaf8265aae176cdd48c226f5719 Simulation is complete, simulated time: 4.693 us
-f45cfd58a09cb512bec42a1bb30ca347 Simulation is complete, simulated time: 55.651 us
+f45cfd58a09cb512bec42a1bb30ca347 Simulation is complete, simulated time: 53.187 us
 56d186afacb520f350c17bb40e155a99 Simulation is complete, simulated time: 4.926 us
 23b2e8caf4b9ebd8087bbc701937f596 Simulation is complete, simulated time: 40.57 us
diff --git a/src/sst/elements/ember/tests/refFiles/test_EmberSweep.out b/src/sst/elements/ember/tests/refFiles/test_EmberSweep.out
index dbce8f301..5a7a678a3 100644
--- a/src/sst/elements/ember/tests/refFiles/test_EmberSweep.out
+++ b/src/sst/elements/ember/tests/refFiles/test_EmberSweep.out
@@ -1,87 +1,87 @@
-f9148701b5882168aef0a43d84f06535 Simulation is complete, simulated time: 690.34 us
-0e90c343d7bd6368ebca64220f3db66c Simulation is complete, simulated time: 325.176 us
-2c2c1aa59094b3948fce6f0e3bc696a9 Simulation is complete, simulated time: 106.586 us
-91aa1219e84c1087fe994713702563b8 Simulation is complete, simulated time: 106.586 us
-115ba9e30906b68930351aa80e66e883 Simulation is complete, simulated time: 132.522 us
-fe8bb43695a69f9bf4be80cf167919f3 Simulation is complete, simulated time: 87.966 us
-af9d4242ad221525caf7857252ddc8a1 Simulation is complete, simulated time: 57.302 us
-6d139a038a7bdd217a1a81a6ba2327af Simulation is complete, simulated time: 57.302 us
-431d47a0e52dededfefc8c9a365eaf48 Simulation is complete, simulated time: 471.286 us
-cf46ab95958759929ac1da021083b644 Simulation is complete, simulated time: 220.192 us
-42d70a0bf1f40f514ec6e214e1dcad55 Simulation is complete, simulated time: 71.994 us
-4cf1a6ff422adbac0b8413ee06e74700 Simulation is complete, simulated time: 71.994 us
-0021543ef1e4a1b296a98880b2d1684b Simulation is complete, simulated time: 78.53 us
-4894c19eb908a3dc5d9efa6997c0da43 Simulation is complete, simulated time: 52.66 us
-382559dd92121451150eb3150c5a5eb4 Simulation is complete, simulated time: 33.078 us
-4aa9e3e7152618b193edf4a6ff59d208 Simulation is complete, simulated time: 33.078 us
+f9148701b5882168aef0a43d84f06535 Simulation is complete, simulated time: 693.776 us
+0e90c343d7bd6368ebca64220f3db66c Simulation is complete, simulated time: 324.598 us
+2c2c1aa59094b3948fce6f0e3bc696a9 Simulation is complete, simulated time: 106.588 us
+91aa1219e84c1087fe994713702563b8 Simulation is complete, simulated time: 106.588 us
+115ba9e30906b68930351aa80e66e883 Simulation is complete, simulated time: 132.428 us
+fe8bb43695a69f9bf4be80cf167919f3 Simulation is complete, simulated time: 87.906 us
+af9d4242ad221525caf7857252ddc8a1 Simulation is complete, simulated time: 57.304 us
+6d139a038a7bdd217a1a81a6ba2327af Simulation is complete, simulated time: 57.304 us
+431d47a0e52dededfefc8c9a365eaf48 Simulation is complete, simulated time: 470.982 us
+cf46ab95958759929ac1da021083b644 Simulation is complete, simulated time: 220.164 us
+42d70a0bf1f40f514ec6e214e1dcad55 Simulation is complete, simulated time: 71.978 us
+4cf1a6ff422adbac0b8413ee06e74700 Simulation is complete, simulated time: 71.978 us
+0021543ef1e4a1b296a98880b2d1684b Simulation is complete, simulated time: 78.476 us
+4894c19eb908a3dc5d9efa6997c0da43 Simulation is complete, simulated time: 52.632 us
+382559dd92121451150eb3150c5a5eb4 Simulation is complete, simulated time: 33.062 us
+4aa9e3e7152618b193edf4a6ff59d208 Simulation is complete, simulated time: 33.062 us
 4d890426edfedebd1552e37469516ff7 Simulation is complete, simulated time: 403.668 us
-d2cfb7f1f71336f17a81de1fedd00b6e Simulation is complete, simulated time: 201.672 us
+d2cfb7f1f71336f17a81de1fedd00b6e Simulation is complete, simulated time: 201.664 us
 9322839b463a9e55b68d1d9e8ddedd19 Simulation is complete, simulated time: 52.418 us
 001c82297937bb080fae7a6cdb3f61f4 Simulation is complete, simulated time: 52.418 us
 17902bf7775857fbe65e5f57b2f8d72b Simulation is complete, simulated time: 53.784 us
-cb472cf10fb151d7296296ca33e3db93 Simulation is complete, simulated time: 34.092 us
+cb472cf10fb151d7296296ca33e3db93 Simulation is complete, simulated time: 34.084 us
 d0e6a39c1019390ceb259cbc787dbb0a Simulation is complete, simulated time: 18.686 us
 8cb23569bf77091b72cf9f1b01aecb88 Simulation is complete, simulated time: 18.686 us
 660a7af8cea40110e3600dce9f36fac7 Simulation is complete, simulated time: 289.62 us
-19067cfec0e1cc1055dc356df14317f0 Simulation is complete, simulated time: 144.278 us
+19067cfec0e1cc1055dc356df14317f0 Simulation is complete, simulated time: 144.274 us
 6cc8cb6e8b89f1b587f37713d1dcc2b4 Simulation is complete, simulated time: 36.26 us
 5269c45b7ffc749d8a0846363c088b23 Simulation is complete, simulated time: 36.26 us
 fe874889da6d2bdb147a5ca1186ccfc6 Simulation is complete, simulated time: 30.456 us
-e55452b6a168ce14f76e318f640249e6 Simulation is complete, simulated time: 16.154 us
+e55452b6a168ce14f76e318f640249e6 Simulation is complete, simulated time: 16.15 us
 17679b71424e99a001a11fd28ccc52b8 Simulation is complete, simulated time: 5.12 us
 a5e7fadc6abe02c2e6f54e3513012502 Simulation is complete, simulated time: 5.12 us
-bfc69dca082f162993d2e38e9e8877bb Simulation is complete, simulated time: 584.932 us
-1ad3729dc73100046994602d33d666f8 Simulation is complete, simulated time: 106.962 us
-8d95197b68b0051907275fc069c71a69 Simulation is complete, simulated time: 327.816 us
-712cd6fb0ebc4ea047ab28349ed3d7e8 Simulation is complete, simulated time: 59.976 us
+bfc69dca082f162993d2e38e9e8877bb Simulation is complete, simulated time: 584.838 us
+1ad3729dc73100046994602d33d666f8 Simulation is complete, simulated time: 106.94 us
+8d95197b68b0051907275fc069c71a69 Simulation is complete, simulated time: 327.72 us
+712cd6fb0ebc4ea047ab28349ed3d7e8 Simulation is complete, simulated time: 59.952 us
 b09246562ad24d0ddabfaae6848af118 Simulation is complete, simulated time: 174.226 us
 7dd86e625136f4a6f13e1c459441c28a Simulation is complete, simulated time: 31.918 us
 bdef5ba2f13dc8d41220d0c1b0cc56d2 Simulation is complete, simulated time: 26.66 us
 4af81df20e83081566ed0df1e5d29423 Simulation is complete, simulated time: 4.988 us
-cbe44583fd5325992ae2396285f9a2e5 Simulation is complete, simulated time: 583.902 us
-3126db581e052167173abd660a4b73a2 Simulation is complete, simulated time: 106.866 us
-5e3e93d20e6e1c14f48768520169506c Simulation is complete, simulated time: 327.374 us
-940d0e07357334d8aeacbdd5ebf685a8 Simulation is complete, simulated time: 59.93 us
+cbe44583fd5325992ae2396285f9a2e5 Simulation is complete, simulated time: 583.824 us
+3126db581e052167173abd660a4b73a2 Simulation is complete, simulated time: 106.86 us
+5e3e93d20e6e1c14f48768520169506c Simulation is complete, simulated time: 327.198 us
+940d0e07357334d8aeacbdd5ebf685a8 Simulation is complete, simulated time: 59.898 us
 a6e30ee343d328d9cf31dc5d33b0028b Simulation is complete, simulated time: 173.75 us
 e4b5931f8f843946c74305e42c482b39 Simulation is complete, simulated time: 31.874 us
 2800136784d7682457016d45f7084058 Simulation is complete, simulated time: 26.58 us
 d17fc68182994dbb26261f2602f67f91 Simulation is complete, simulated time: 4.98 us
-3135fa10d2b9b80d1d2e392ab8edb94c Simulation is complete, simulated time: 309.59 us
-9e8bc54037e2b467c6042aa863fdf3e4 Simulation is complete, simulated time: 163.54 us
-22e053ffd1a25a2bac547b439bf481eb Simulation is complete, simulated time: 53.862 us
-7fd1ecc87d3bf5c932a471d3d04dfb19 Simulation is complete, simulated time: 53.862 us
-816cfc39f61ab0b782167b22f5571b2f Simulation is complete, simulated time: 55.376 us
-41ac1ab7567c7be19e4acf85356224cc Simulation is complete, simulated time: 53.862 us
-4e0b6a8c381046d7812e6584391a3dfd Simulation is complete, simulated time: 53.862 us
-7520a9589534dc3399350218f5b5fb9c Simulation is complete, simulated time: 53.862 us
-4652a3a4b4e58a756dbb3658cd6445b0 Simulation is complete, simulated time: 297.766 us
-238ff71fbe090af2a8d8365cdfe9015f Simulation is complete, simulated time: 152.016 us
-ed16cde15ad56d11ce820328e6eec983 Simulation is complete, simulated time: 42.298 us
-d27ae204723073d310ab5501fe709e46 Simulation is complete, simulated time: 42.298 us
-6f44e038b0122d90e55ced962a793ecf Simulation is complete, simulated time: 43.552 us
-68a837238085589e901c2dab260f4a77 Simulation is complete, simulated time: 30.214 us
-7180f32fc363f4052e5988df297daabe Simulation is complete, simulated time: 30.214 us
-cd8870938eb94eb9189890625c473c3d Simulation is complete, simulated time: 30.214 us
-e3e3b0fbd245fe264f05e0dfeb3a96f5 Simulation is complete, simulated time: 290.65 us
+3135fa10d2b9b80d1d2e392ab8edb94c Simulation is complete, simulated time: 309.586 us
+9e8bc54037e2b467c6042aa863fdf3e4 Simulation is complete, simulated time: 163.536 us
+22e053ffd1a25a2bac547b439bf481eb Simulation is complete, simulated time: 53.864 us
+7fd1ecc87d3bf5c932a471d3d04dfb19 Simulation is complete, simulated time: 53.864 us
+816cfc39f61ab0b782167b22f5571b2f Simulation is complete, simulated time: 55.372 us
+41ac1ab7567c7be19e4acf85356224cc Simulation is complete, simulated time: 53.864 us
+4e0b6a8c381046d7812e6584391a3dfd Simulation is complete, simulated time: 53.864 us
+7520a9589534dc3399350218f5b5fb9c Simulation is complete, simulated time: 53.864 us
+4652a3a4b4e58a756dbb3658cd6445b0 Simulation is complete, simulated time: 297.754 us
+238ff71fbe090af2a8d8365cdfe9015f Simulation is complete, simulated time: 152.004 us
+ed16cde15ad56d11ce820328e6eec983 Simulation is complete, simulated time: 42.286 us
+d27ae204723073d310ab5501fe709e46 Simulation is complete, simulated time: 42.286 us
+6f44e038b0122d90e55ced962a793ecf Simulation is complete, simulated time: 43.54 us
+68a837238085589e901c2dab260f4a77 Simulation is complete, simulated time: 30.198 us
+7180f32fc363f4052e5988df297daabe Simulation is complete, simulated time: 30.198 us
+cd8870938eb94eb9189890625c473c3d Simulation is complete, simulated time: 30.198 us
+e3e3b0fbd245fe264f05e0dfeb3a96f5 Simulation is complete, simulated time: 290.642 us
 73a8ce800f6453375e9b600ad7e4fe41 Simulation is complete, simulated time: 145.418 us
 f8e0b916448926eed8466820a7eda8fa Simulation is complete, simulated time: 36.208 us
 cd042be76b913d850f8fdff9a2481475 Simulation is complete, simulated time: 36.208 us
-e4101cb44c071a6e2c4fb8368ae8bb76 Simulation is complete, simulated time: 36.436 us
+e4101cb44c071a6e2c4fb8368ae8bb76 Simulation is complete, simulated time: 36.428 us
 4de551b8f36f3ea1453221e9677454c7 Simulation is complete, simulated time: 22.244 us
 e6e03c886bf3e4b7ea8653307b6153ee Simulation is complete, simulated time: 16.11 us
 9e4c66ef47cb7876bacecc38ea81ee26 Simulation is complete, simulated time: 16.11 us
 8a68d5fd292c49f030bc1ee12a4b8c2a Simulation is complete, simulated time: 279.62 us
-02933097e8d6246b308b72bd04e07fae Simulation is complete, simulated time: 134.278 us
+02933097e8d6246b308b72bd04e07fae Simulation is complete, simulated time: 134.274 us
 573c3bf8f3d333a8703849c683dfe9ca Simulation is complete, simulated time: 26.26 us
 23992079780db210569c170fae59484e Simulation is complete, simulated time: 26.26 us
 229645dd3776802dcc44aa5052759745 Simulation is complete, simulated time: 29.456 us
-f1806e7f40ee6b65f1a59524436f3e58 Simulation is complete, simulated time: 15.154 us
+f1806e7f40ee6b65f1a59524436f3e58 Simulation is complete, simulated time: 15.15 us
 e35903299970e05df07fe69044b23db7 Simulation is complete, simulated time: 4.12 us
 a23d85edc49a8319faea14f6104ed70b Simulation is complete, simulated time: 4.12 us
-a0e9395740e0ba1066d452b7f6150972 Simulation is complete, simulated time: 173.11 us
-67c1b7a19eda27856d723cc12310d44d Simulation is complete, simulated time: 66.138 us
-ff2181e1001bbd14be3c8cb87f7424c6 Simulation is complete, simulated time: 149.16 us
-3fb0ec79b92ba3a3689a06207090adfe Simulation is complete, simulated time: 42.196 us
+a0e9395740e0ba1066d452b7f6150972 Simulation is complete, simulated time: 173.094 us
+67c1b7a19eda27856d723cc12310d44d Simulation is complete, simulated time: 66.13 us
+ff2181e1001bbd14be3c8cb87f7424c6 Simulation is complete, simulated time: 149.144 us
+3fb0ec79b92ba3a3689a06207090adfe Simulation is complete, simulated time: 42.184 us
 e3e2d8dc599e7a1ab1792babb0906591 Simulation is complete, simulated time: 134.968 us
 8890802942e86eacb595645af11af002 Simulation is complete, simulated time: 28.118 us
 bc1d4f1314c411bdd4701c48a30690d5 Simulation is complete, simulated time: 115.684 us
@@ -90,46 +90,46 @@ f1c87034a0fc16ba466ef45968c50c5a Simulation is complete, simulated time: 570.481
 b12b4259d49c38f92d3355943c5a1c8e Simulation is complete, simulated time: 271.51 ms
 71823203c538cb4c0f68e6acbe70817f Simulation is complete, simulated time: 50.817 ms
 596174a04f00aa3cdf08bcc4514bc41a Simulation is complete, simulated time: 50.817 ms
-6daed542a784105b137921db9bff88e0 Simulation is complete, simulated time: 57.0873 ms
+6daed542a784105b137921db9bff88e0 Simulation is complete, simulated time: 57.0872 ms
 09140c7ca0bfdc4502c6b345bfc443d0 Simulation is complete, simulated time: 27.1914 ms
 ba990016e99403f7da9e02fee83776b1 Simulation is complete, simulated time: 5.1218 ms
 bca7566207bfe21653cb97734c903613 Simulation is complete, simulated time: 5.1218 ms
 2b8c519e111ea2074c8aeb141d0fc3c9 Simulation is complete, simulated time: 71.4938 ms
 3572aa54143ccd69cd7336e19e9f37c2 Simulation is complete, simulated time: 34.0142 ms
-c54b92ace9d2a4d0163657390a2eae5a Simulation is complete, simulated time: 6.42732 ms
-66e3e3e11b2f0e4234f34344fe9fe2a4 Simulation is complete, simulated time: 6.42732 ms
-a4ec842644869eeca709b0efdfe2eb10 Simulation is complete, simulated time: 7.17192 ms
-f2145d7ed91eba4d4d7592dc58f99004 Simulation is complete, simulated time: 3.42519 ms
-d24b00c32a85c107660c99e318ec504c Simulation is complete, simulated time: 666.164 us
-2a8905b9bbe905edf5f4b6e60d4a5f76 Simulation is complete, simulated time: 666.164 us
+c54b92ace9d2a4d0163657390a2eae5a Simulation is complete, simulated time: 6.42731 ms
+66e3e3e11b2f0e4234f34344fe9fe2a4 Simulation is complete, simulated time: 6.42731 ms
+a4ec842644869eeca709b0efdfe2eb10 Simulation is complete, simulated time: 7.1719 ms
+f2145d7ed91eba4d4d7592dc58f99004 Simulation is complete, simulated time: 3.42517 ms
+d24b00c32a85c107660c99e318ec504c Simulation is complete, simulated time: 666.156 us
+2a8905b9bbe905edf5f4b6e60d4a5f76 Simulation is complete, simulated time: 666.156 us
 14bf7e313f6020d7b4fcba866963009d Simulation is complete, simulated time: 8.99435 ms
 0bd1a6668eb9631425a3042518af7c99 Simulation is complete, simulated time: 4.27878 ms
 58190ed78f0bd1bf204f0af55da8a628 Simulation is complete, simulated time: 830.094 us
 afb09a23da194b4800e993ef052497c0 Simulation is complete, simulated time: 830.094 us
 52692e0fabe6f7e883bf5fe25db6f28d Simulation is complete, simulated time: 911.34 us
-2151fd8fd52ea2cdf407be1ea75fc714 Simulation is complete, simulated time: 440.892 us
+2151fd8fd52ea2cdf407be1ea75fc714 Simulation is complete, simulated time: 440.888 us
 ca7dd241eb349fb3c4a8cc8c3f5881f2 Simulation is complete, simulated time: 95.694 us
 45a1ba82dd503d0f4a67f1f879cdaaf0 Simulation is complete, simulated time: 95.694 us
 702da30d93f3b948d8520570a850b598 Simulation is complete, simulated time: 279.62 us
-5b9852eb7eb1e65f275e30d8fa870855 Simulation is complete, simulated time: 134.278 us
+5b9852eb7eb1e65f275e30d8fa870855 Simulation is complete, simulated time: 134.274 us
 4ad22278b025ba626e6778f52a3ec421 Simulation is complete, simulated time: 26.26 us
 02dd72761b5dc0e44123a442ce30e53d Simulation is complete, simulated time: 26.26 us
 b2dc2bc4ef1e2114f61d0fa7bee553c7 Simulation is complete, simulated time: 29.456 us
-1eaaab070feb10f178d4b15646e7bb23 Simulation is complete, simulated time: 15.154 us
+1eaaab070feb10f178d4b15646e7bb23 Simulation is complete, simulated time: 15.15 us
 cc590dc6b4d13afff52ec490aed55e95 Simulation is complete, simulated time: 4.12 us
 d83aa9f05b2e4832734ad22083a4d9e9 Simulation is complete, simulated time: 4.12 us
 960312de39c728e28fca22b5983a3c40 Simulation is complete, simulated time: 344.674 us
-144d9bce36c713bed393b5bd62bf0aed Simulation is complete, simulated time: 182.052 us
+144d9bce36c713bed393b5bd62bf0aed Simulation is complete, simulated time: 182.048 us
 c6e2db182577973f618cbf934efd6896 Simulation is complete, simulated time: 74.034 us
 546e93a9df1ce1dad6fff7bcb03649b5 Simulation is complete, simulated time: 74.034 us
 88bfc7de2eb0d43a909243344a5745c3 Simulation is complete, simulated time: 62.182 us
-a969c19f26cbf85639768d08213c4548 Simulation is complete, simulated time: 45.214 us
+a969c19f26cbf85639768d08213c4548 Simulation is complete, simulated time: 45.21 us
 26237ef50c2515b6f2f915a2acdc6ab6 Simulation is complete, simulated time: 34.18 us
 95123412ba2c8c9aae1450f981811652 Simulation is complete, simulated time: 34.18 us
-d68060dca621d24c9378d202c758d946 Simulation is complete, simulated time: 340.686 us
-b128e05840e08cd0cb4e2538b8042c89 Simulation is complete, simulated time: 63 us
-afec978ec8a1a2f772cde9da3e2cd517 Simulation is complete, simulated time: 339.826 us
-75e0edc6a556695151d7c1f407fe342e Simulation is complete, simulated time: 62.914 us
+d68060dca621d24c9378d202c758d946 Simulation is complete, simulated time: 340.646 us
+b128e05840e08cd0cb4e2538b8042c89 Simulation is complete, simulated time: 62.996 us
+afec978ec8a1a2f772cde9da3e2cd517 Simulation is complete, simulated time: 339.786 us
+75e0edc6a556695151d7c1f407fe342e Simulation is complete, simulated time: 62.91 us
 b2f26c9309a2bc32ed5c5e34fff2a378 Simulation is complete, simulated time: 289.4 us
 3c30fb54fe68b83f9f5cb5918a40ee7b Simulation is complete, simulated time: 149.41 us
 aa05e71e67ea3b62c46b18dd4e51430d Simulation is complete, simulated time: 38.95 us
@@ -148,28 +148,28 @@ bf7ab053912211e6896d568bcdfd10aa Simulation is complete, simulated time: 32.146
 1f4b410cb8f5af0772192bf7f7050adb Simulation is complete, simulated time: 9.51922 ms
 1c3bd562153153acccd729e64696e445 Simulation is complete, simulated time: 1.66315 ms
 b97b2a5e0fd3f06dfcd72d95b2488181 Simulation is complete, simulated time: 1.66315 ms
-ce2d511d03dc1083254fdb8149d5d78d Simulation is complete, simulated time: 980.05 us
-76c149e1febd7e75db2490e0264a9c36 Simulation is complete, simulated time: 474.628 us
-5349a49ce4d592fcd05b7a325340f6bd Simulation is complete, simulated time: 62.67 us
-b2b4d11fbdecce0b210d1e1b160d72ee Simulation is complete, simulated time: 62.67 us
-24d396b8f9a2f7ba93aae535846faae8 Simulation is complete, simulated time: 183.082 us
-c0d87dcfba45f8a4ff3c00b366690df5 Simulation is complete, simulated time: 100.676 us
-afb01206c82063b731e5aebc2ce8ec25 Simulation is complete, simulated time: 26.542 us
-c308502dd6ef326602bdfe34bfb65f9b Simulation is complete, simulated time: 26.542 us
-f979ade310cf5e5a799ae0486b111396 Simulation is complete, simulated time: 250.648 us
-3ca10858781a47f8fcad04f8741b9233 Simulation is complete, simulated time: 46.294 us
-609044249f1450ade3972c1b10b5f9af Simulation is complete, simulated time: 250.694 us
-1eca3bc2b651e398136e64ea00ea117a Simulation is complete, simulated time: 46.196 us
+ce2d511d03dc1083254fdb8149d5d78d Simulation is complete, simulated time: 987.202 us
+76c149e1febd7e75db2490e0264a9c36 Simulation is complete, simulated time: 475.366 us
+5349a49ce4d592fcd05b7a325340f6bd Simulation is complete, simulated time: 62.706 us
+b2b4d11fbdecce0b210d1e1b160d72ee Simulation is complete, simulated time: 62.678 us
+24d396b8f9a2f7ba93aae535846faae8 Simulation is complete, simulated time: 182.988 us
+c0d87dcfba45f8a4ff3c00b366690df5 Simulation is complete, simulated time: 100.564 us
+afb01206c82063b731e5aebc2ce8ec25 Simulation is complete, simulated time: 26.528 us
+c308502dd6ef326602bdfe34bfb65f9b Simulation is complete, simulated time: 26.35 us
+f979ade310cf5e5a799ae0486b111396 Simulation is complete, simulated time: 250.41 us
+3ca10858781a47f8fcad04f8741b9233 Simulation is complete, simulated time: 46.262 us
+609044249f1450ade3972c1b10b5f9af Simulation is complete, simulated time: 250.554 us
+1eca3bc2b651e398136e64ea00ea117a Simulation is complete, simulated time: 46.164 us
 78327f12e39cf1507167d72a9378899d Simulation is complete, simulated time: 285.33 us
-d6eacb959fbc5b65a8fa090e06b4b425 Simulation is complete, simulated time: 145.506 us
+d6eacb959fbc5b65a8fa090e06b4b425 Simulation is complete, simulated time: 145.502 us
 5cb57d70e27537af0a93840a9d980623 Simulation is complete, simulated time: 35.78 us
 22fc41c27b77385bbdffbddb0b0c1448 Simulation is complete, simulated time: 35.78 us
 41e4cb67999e43e2bd77ab8ce64dd58b Simulation is complete, simulated time: 38.892 us
-78b1729aa3ac830c89600a43053728f2 Simulation is complete, simulated time: 24.924 us
-483fde91b00ab4631ec051045303997f Simulation is complete, simulated time: 23.474 us
-2621aa1cff5bc5981d61a0bfe0455672 Simulation is complete, simulated time: 23.474 us
-da171a7129404285d82717b052b91edd Simulation is complete, simulated time: 142.312 us
-0a06580ee788d8b74fd1cdc492a8a0ab Simulation is complete, simulated time: 35.628 us
+78b1729aa3ac830c89600a43053728f2 Simulation is complete, simulated time: 24.92 us
+483fde91b00ab4631ec051045303997f Simulation is complete, simulated time: 23.464 us
+2621aa1cff5bc5981d61a0bfe0455672 Simulation is complete, simulated time: 23.464 us
+da171a7129404285d82717b052b91edd Simulation is complete, simulated time: 142.072 us
+0a06580ee788d8b74fd1cdc492a8a0ab Simulation is complete, simulated time: 35.36 us
 6c434f43be3d53f7675b6993a2eec81b Simulation is complete, simulated time: 69.2969 ms
 b05f95c23e5058fefaa1a31abdcbca53 Simulation is complete, simulated time: 33.2789 ms
 b601ada10a77231452f4e8d31b252ad0 Simulation is complete, simulated time: 5.69201 ms
diff --git a/src/sst/elements/firefly/nic.cc b/src/sst/elements/firefly/nic.cc
index c338fcaf9..f9d0a8e6f 100644
--- a/src/sst/elements/firefly/nic.cc
+++ b/src/sst/elements/firefly/nic.cc
@@ -39,6 +39,7 @@ Nic::Nic(ComponentId_t id, Params &params) :
     m_useDetailedCompute(false),
     m_getKey(10),
     m_simpleMemoryModel(NULL),
+    m_respKey(0),
     m_linkWidget(this)
 {
     m_myNodeId = params.find<int>("nid", -1);
@@ -82,11 +83,14 @@ Nic::Nic(ComponentId_t id, Params &params) :
         assert(0);
     }
 
-	UnitAlgebra buf_size = params.find<SST::UnitAlgebra>("buffer_size" );
+	UnitAlgebra input_buf_size = params.find<SST::UnitAlgebra>("input_buf_size" );
+	UnitAlgebra output_buf_size = params.find<SST::UnitAlgebra>("output_buf_size" );
 	UnitAlgebra link_bw = params.find<SST::UnitAlgebra>("link_bw" );
 
-    m_dbg.verbose(CALL_INFO,1,1,"id=%d buffer_size=%s link_bw=%s "
-			"packetSize=%d\n", m_myNodeId, buf_size.toString().c_str(),
+    m_dbg.verbose(CALL_INFO,1,1,"id=%d input_buf_size=%s output_buf_size=%s link_bw=%s "
+			"packetSize=%d\n", m_myNodeId, 
+            input_buf_size.toString().c_str(),
+            output_buf_size.toString().c_str(),
 			link_bw.toString().c_str(), packetSizeInBytes);
 
     m_linkControl = (SimpleNetwork*)loadSubComponent(
@@ -94,7 +98,7 @@ Nic::Nic(ComponentId_t id, Params &params) :
     assert( m_linkControl );
 
 	m_linkControl->initialize(params.find<std::string>("rtrPortName","rtr"),
-                              link_bw, 2, buf_size, buf_size);
+                              link_bw, 2, input_buf_size, output_buf_size);
 
     m_recvNotifyFunctor =
         new SimpleNetwork::Handler<Nic>(this,&Nic::recvNotify );
@@ -540,7 +544,7 @@ void Nic::dmaWrite( int unit, std::vector<MemOp>* vec, Callback callback ) {
 Nic::DmaRecvEntry* Nic::findPut( int src, MsgHdr& hdr, RdmaMsgHdr& rdmahdr )
 {
     m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE,
-                    "src=%d len=%lu\n",src,hdr.len);
+                    "src=%d len=%lu\n",src,rdmahdr.len);
     m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE,
                     "rgnNum=%d offset=%d respKey=%d\n",
             rdmahdr.rgnNum, rdmahdr.offset, rdmahdr.respKey);
@@ -585,18 +589,17 @@ Nic::SendEntryBase* Nic::findGet( int src,
                                     rdmaHdr.respKey, entry );
 }
 
-Nic::EntryBase* Nic::findRecv( int srcNode, MsgHdr& hdr, int tag  )
+Nic::EntryBase* Nic::findRecv( int srcNode, MsgHdr& hdr, MatchMsgHdr& matchHdr  )
 {
     m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE,"need a recv entry, srcNic=%d src_vNic=%d "
                 "dst_vNic=%d tag=%#x len=%lu\n", srcNode, hdr.src_vNicId,
-                        hdr.dst_vNicId, tag, hdr.len);
+                        hdr.dst_vNicId, matchHdr.tag, matchHdr.len);
 
-    if ( m_recvM[hdr.dst_vNicId].find( tag ) == m_recvM[hdr.dst_vNicId].end() ) {
-        m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE,"did't match tag\n");
+    if ( m_recvM[hdr.dst_vNicId].find( matchHdr.tag ) == m_recvM[hdr.dst_vNicId].end() ) { m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE,"did't match tag\n");
         return NULL;
     }
 
-    DmaRecvEntry* entry = m_recvM[ hdr.dst_vNicId][ tag ].front();
+    DmaRecvEntry* entry = m_recvM[ hdr.dst_vNicId][ matchHdr.tag ].front();
     if ( entry->node() != -1 && entry->node() != srcNode ) {
         m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE,
                 "didn't match node  want=%#x src=%#x\n",
@@ -606,15 +609,15 @@ Nic::EntryBase* Nic::findRecv( int srcNode, MsgHdr& hdr, int tag  )
     m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE,
                 "recv entry size %lu\n",entry->totalBytes());
 
-    if ( entry->totalBytes() < hdr.len ) {
+    if ( entry->totalBytes() < matchHdr.len ) {
         assert(0);
     }
 
     m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE,"found a receive entry\n");
 
-    m_recvM[ hdr.dst_vNicId ][ tag ].pop_front();
-    if ( m_recvM[ hdr.dst_vNicId ][ tag ].empty() ) {
-        m_recvM[ hdr.dst_vNicId ].erase( tag );
+    m_recvM[ hdr.dst_vNicId ][ matchHdr.tag ].pop_front();
+    if ( m_recvM[ hdr.dst_vNicId ][ matchHdr.tag ].empty() ) {
+        m_recvM[ hdr.dst_vNicId ].erase( matchHdr.tag );
     }
     return entry;
 }
diff --git a/src/sst/elements/firefly/nic.h b/src/sst/elements/firefly/nic.h
index 25437ddfb..6b1bba51f 100644
--- a/src/sst/elements/firefly/nic.h
+++ b/src/sst/elements/firefly/nic.h
@@ -43,6 +43,7 @@ namespace Firefly {
 
 class Nic : public SST::Component  {
 
+    typedef unsigned RespKey_t;
 	class LinkControlWidget {
 
 	  public:
@@ -88,23 +89,29 @@ class Nic : public SST::Component  {
 
   private:
 
-    struct MsgHdr {
-        enum Op { Msg, Rdma, Shmem } op;
+    struct __attribute__ ((packed)) MsgHdr {
+        enum Op : unsigned char { Msg, Rdma, Shmem } op;
+        unsigned int    dst_vNicId : 12 ;
+        unsigned int    src_vNicId : 12 ;
+    };
+
+    struct __attribute__ ((packed)) MatchMsgHdr {
         size_t len;
-        unsigned short    dst_vNicId;
-        unsigned short    src_vNicId;
+        int    tag;
     };
+
     struct __attribute__ ((packed)) ShmemMsgHdr {
         ShmemMsgHdr() : op2(0) {}
-        enum Op : unsigned char { Ack, Put, Get, GetResp, Add, Fadd, Swap, Cswap } op;
-        unsigned char op2; 
-        unsigned char dataType;
-        unsigned char pad;
-        uint32_t length;
         uint64_t vaddr;
-        uint64_t respKey;
+        uint32_t length;
+        enum Op { Ack, Put, Get, GetResp, Add, Fadd, Swap, Cswap };
+        unsigned char op : 3; 
+        unsigned char op2 : 3; 
+        unsigned char dataType : 3;
+        uint8_t respKey : 7;
     };
     struct RdmaMsgHdr {
+        size_t len;
         enum { Put, Get, GetResp } op;
         uint16_t    rgnNum;
         uint16_t    respKey;
@@ -212,7 +219,7 @@ public:
     void processNetworkEvent( FireflyNetworkEvent* );
     DmaRecvEntry* findPut( int src, MsgHdr& hdr, RdmaMsgHdr& rdmahdr );
     SendEntryBase* findGet( int src, MsgHdr& hdr, RdmaMsgHdr& rdmaHdr );
-    EntryBase* findRecv( int srcNode, MsgHdr&, int tag );
+    EntryBase* findRecv( int srcNode, MsgHdr&, MatchMsgHdr& );
 
     Hermes::MemAddr findShmem( int core, Hermes::Vaddr  addr, size_t length );
 
@@ -353,6 +360,24 @@ public:
 			delete ops;
 		}
 	}
+    RespKey_t m_respKey;
+    RespKey_t genRespKey( void* ptr ) {
+        assert( m_respKeyMap.find(m_respKey) == m_respKeyMap.end() );
+        RespKey_t key = m_respKey++;
+        m_respKeyMap[key++] = ptr;  
+        m_respKey &= (128 - 1);
+        m_dbg.verbose(CALL_INFO,2,1,"key=%#x nextKey=%#x\n",key,m_respKey);
+        return key;
+    }
+    void* getRespKeyValue( RespKey_t key ) {
+        --key;  
+        m_dbg.verbose(CALL_INFO,2,1,"key=%#x\n",key);
+        void* value = m_respKeyMap[key];
+        m_respKeyMap.erase(key);
+        return value; 
+    }
+
+    std::map<RespKey_t,void*> m_respKeyMap;
 
     SimpleMemoryModel*  m_simpleMemoryModel;
     std::deque<int> m_availNicUnits;
diff --git a/src/sst/elements/firefly/nicMsgStream.cc b/src/sst/elements/firefly/nicMsgStream.cc
index 35f44d597..940f9a9a6 100644
--- a/src/sst/elements/firefly/nicMsgStream.cc
+++ b/src/sst/elements/firefly/nicMsgStream.cc
@@ -25,18 +25,18 @@ Nic::RecvMachine::MsgStream::MsgStream( Output& output, FireflyNetworkEvent* ev,
     StreamBase(output,rm,unit)
 {
     m_hdr = *(MsgHdr*) ev->bufPtr();
-    m_tag = *(int*) ev->bufPtr( sizeof(MsgHdr) );
+    MatchMsgHdr& matchHdr = *(MatchMsgHdr*) ev->bufPtr( sizeof(MsgHdr) );
     m_src = ev->src;
 
     m_dbg.verbose(CALL_INFO,1,NIC_DBG_RECV_MACHINE,"Msg Operation srcNode=%d tag=%#x lenght=%lu\n",
-                            m_src,m_tag,m_hdr.len);
+                            m_src,matchHdr.tag,matchHdr.len);
 
     Callback callback;
 
-    m_recvEntry = static_cast<DmaRecvEntry *>( m_rm.nic().findRecv( m_src, m_hdr, m_tag ) );
+    m_recvEntry = static_cast<DmaRecvEntry *>( m_rm.nic().findRecv( m_src, m_hdr, matchHdr ) );
     if ( m_recvEntry ) {
         ev->bufPop( sizeof(MsgHdr) );
-        ev->bufPop( sizeof(m_tag) );
+        ev->bufPop( sizeof(MatchMsgHdr) );
 
         callback = std::bind( &Nic::RecvMachine::state_move_0, &m_rm, ev, this );
 
@@ -45,5 +45,6 @@ Nic::RecvMachine::MsgStream::MsgStream( Output& output, FireflyNetworkEvent* ev,
     }
     m_rm.nic().schedCallback( callback, m_rm.m_rxMatchDelay );
 
-    m_matched_len = m_hdr.len;
+    m_matched_len = matchHdr.len;
+    m_matched_tag = matchHdr.tag;
 }
diff --git a/src/sst/elements/firefly/nicMsgStream.h b/src/sst/elements/firefly/nicMsgStream.h
index 366c8d3a0..6aa3b4788 100644
--- a/src/sst/elements/firefly/nicMsgStream.h
+++ b/src/sst/elements/firefly/nicMsgStream.h
@@ -22,15 +22,17 @@ class MsgStream : public StreamBase {
 			if ( entry ) {
 				m_recvEntry = entry;
 			} else { 
-				m_recvEntry = static_cast<DmaRecvEntry *>( m_rm.nic().findRecv( m_src, m_hdr, m_tag ) );
+				m_recvEntry = static_cast<DmaRecvEntry *>( m_rm.nic().findRecv( m_src, m_hdr, m_matchHdr) );
 			}
 			
 			assert(m_recvEntry);
 
        		ev->bufPop( sizeof(MsgHdr) );
-        	ev->bufPop( sizeof(m_tag) );
+        	ev->bufPop( sizeof(MatchMsgHdr) );
 		}
 
     	m_rm.state_move_0( ev, this );
     }
+  private:
+    MatchMsgHdr m_matchHdr;
 };
diff --git a/src/sst/elements/firefly/nicRecvMachine.h b/src/sst/elements/firefly/nicRecvMachine.h
index ccd3416d3..c12f93651 100644
--- a/src/sst/elements/firefly/nicRecvMachine.h
+++ b/src/sst/elements/firefly/nicRecvMachine.h
@@ -23,12 +23,15 @@ class RecvMachine {
             StreamBase(Output& output, RecvMachine& rm, int unit) : 
                 m_dbg(output), m_rm(rm),m_unit(unit),m_recvEntry(NULL),m_sendEntry(NULL)
             {
+                m_dbg.verbose(CALL_INFO,1,NIC_DBG_RECV_MACHINE,"this=%p\n",this);
+                m_start = m_rm.nic().getCurrentSimTimeNano();
 				assert( unit >= 0 );
             }
             virtual ~StreamBase() {
-                m_dbg.verbose(CALL_INFO,1,NIC_DBG_RECV_MACHINE,"notify \n");
+                m_dbg.verbose(CALL_INFO,1,NIC_DBG_RECV_MACHINE,"this=%p latency=%lu\n",this,
+                                            m_rm.nic().getCurrentSimTimeNano()-m_start);
                 if ( m_recvEntry ) {
-                    m_recvEntry->notify( m_hdr.src_vNicId, m_src, m_tag, m_matched_len );
+                    m_recvEntry->notify( m_hdr.src_vNicId, m_src, m_matched_tag, m_matched_len );
                     delete m_recvEntry;
                 }
 				if ( m_sendEntry ) {
@@ -49,9 +52,10 @@ class RecvMachine {
             RecvEntryBase*  m_recvEntry;
             MsgHdr          m_hdr;
             int             m_src;
-            int             m_tag;
             int             m_matched_len;
+            int             m_matched_tag;
             int             m_unit;
+            SimTime_t       m_start;
         };
 
         #include "nicMsgStream.h"
@@ -113,6 +117,7 @@ class RecvMachine {
 
 		bool checkMatch( DmaRecvEntry* entry, FireflyNetworkEvent* event, int vNicNum ) {
 			MsgHdr& hdr = *(MsgHdr*) event->bufPtr();
+			MatchMsgHdr& matchHdr = *(MatchMsgHdr*) ((unsigned char*)event->bufPtr() + sizeof( MsgHdr ));
 			int srcNode = event->src;
 			int tag = *(int*) event->bufPtr( sizeof(MsgHdr) );
     		if ( vNicNum != hdr.dst_vNicId ) {
@@ -133,7 +138,7 @@ class RecvMachine {
     		}
     		m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE, "recv entry size %lu\n",entry->totalBytes());
 
-    		if ( entry->totalBytes() < hdr.len ) {
+    		if ( entry->totalBytes() < matchHdr.len ) {
         		assert(0);
     		}
     		m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE, "matched\n");
@@ -172,10 +177,11 @@ class RecvMachine {
         void processNeedRecv( FireflyNetworkEvent* event ) {
 			m_blockedNetworkEvent = event;
             MsgHdr& hdr = *(MsgHdr*) event->bufPtr();
+			MatchMsgHdr& matchHdr = *(MatchMsgHdr*) ((unsigned char*)event->bufPtr() + sizeof( MsgHdr ));
     		m_dbg.verbose(CALL_INFO,2,NIC_DBG_RECV_MACHINE, "blocked srcNode=%d srcCore=%d dstCore=%d\n",
 				event->src,hdr.src_vNicId, hdr.dst_vNicId);
             m_nic.notifyNeedRecv( hdr.dst_vNicId, hdr.src_vNicId,
-                     event->src, hdr.len);
+                     event->src, matchHdr.len);
         }
 
         FireflyNetworkEvent* getNetworkEvent(int vc ) {
@@ -234,7 +240,7 @@ class CtlMsgRecvMachine : public RecvMachine {
         MsgHdr& hdr = *(MsgHdr*) ev->bufPtr();
         RdmaMsgHdr& rdmaHdr = *(RdmaMsgHdr*) ev->bufPtr( sizeof(MsgHdr) );
 
-        m_dbg.verbose(CALL_INFO,1,NIC_DBG_RECV_MACHINE,"CtlMsg Get Operation src=%d len=%lu\n",ev->src,hdr.len);
+        m_dbg.verbose(CALL_INFO,1,NIC_DBG_RECV_MACHINE,"CtlMsg Get Operation src=%d len=%lu\n",ev->src,rdmaHdr.len);
 
         assert( hdr.op == MsgHdr::Rdma && rdmaHdr.op == RdmaMsgHdr::Get  );
         
diff --git a/src/sst/elements/firefly/nicSendEntry.h b/src/sst/elements/firefly/nicSendEntry.h
index d3613e7c5..57b464e08 100644
--- a/src/sst/elements/firefly/nicSendEntry.h
+++ b/src/sst/elements/firefly/nicSendEntry.h
@@ -45,7 +45,10 @@ class CmdSendEntry: public SendEntryBase, public EntryBase {
         SendEntryBase( local_vNic ),
         m_cmd(cmd),
         m_callback(callback)
-    { }
+    {
+        m_hdr.len = totalBytes();
+        m_hdr.tag = m_cmd->tag;
+    }
 
     ~CmdSendEntry() {
         m_callback (m_cmd->key );
@@ -63,10 +66,11 @@ class CmdSendEntry: public SendEntryBase, public EntryBase {
     MsgHdr::Op getOp()  { return MsgHdr::Msg; }
     int dst_vNic( )     { return m_cmd->dst_vNic; }
     int dest()          { return m_cmd->node; }
-    void* hdr()         { return &m_cmd->tag; }
-    size_t hdrSize()    { return sizeof(m_cmd->tag); }
+    void* hdr()         { return &m_hdr; }
+    size_t hdrSize()    { return sizeof(m_hdr); }
 
   private:
+    MatchMsgHdr         m_hdr;
     NicCmdEvent* m_cmd;
     std::function<void(void*)> m_callback;
 };
diff --git a/src/sst/elements/firefly/nicSendMachine.cc b/src/sst/elements/firefly/nicSendMachine.cc
index 562218d1e..6db75122b 100644
--- a/src/sst/elements/firefly/nicSendMachine.cc
+++ b/src/sst/elements/firefly/nicSendMachine.cc
@@ -39,7 +39,6 @@ void Nic::SendMachine::state_0( SendEntryBase* entry )
     ++m_msgCount;
 #endif
     hdr.op= entry->getOp();
-    hdr.len = entry->totalBytes();
     hdr.dst_vNicId = entry->dst_vNic();
     hdr.src_vNicId = entry->local_vNic(); 
 
diff --git a/src/sst/elements/firefly/nicShmem.cc b/src/sst/elements/firefly/nicShmem.cc
index 1a196a68a..844d8938f 100644
--- a/src/sst/elements/firefly/nicShmem.cc
+++ b/src/sst/elements/firefly/nicShmem.cc
@@ -251,6 +251,8 @@ void Nic::Shmem::getv( NicShmemGetvCmdEvent* event, int id )
             } 
     ); 
 
+    entry->setRespKey(m_nic.genRespKey(entry));
+
     m_nic.m_sendMachine[0]->run( entry );
 }
 
@@ -274,6 +276,8 @@ void Nic::Shmem::get( NicShmemGetCmdEvent* event, int id )
             } 
     );  
 
+    entry->setRespKey(m_nic.genRespKey(entry));
+
 	m_nic.m_sendMachine[0]->run( entry );
 }
 
@@ -309,6 +313,8 @@ void Nic::Shmem::fadd( NicShmemFaddCmdEvent* event, int id )
             } 
     ); 
 
+    entry->setRespKey(m_nic.genRespKey(entry));
+
     m_nic.m_sendMachine[0]->run( entry );
 }
 
@@ -324,6 +330,8 @@ void Nic::Shmem::cswap( NicShmemCswapCmdEvent* event, int id )
             } 
     ); 
 
+    entry->setRespKey(m_nic.genRespKey(entry));
+
     m_nic.m_sendMachine[0]->run( entry );
 }
 
@@ -339,6 +347,8 @@ void Nic::Shmem::swap( NicShmemSwapCmdEvent* event, int id )
             } 
     ); 
 
+    entry->setRespKey(m_nic.genRespKey(entry));
+
     m_nic.m_sendMachine[0]->run( entry );
 }
 
diff --git a/src/sst/elements/firefly/nicShmemSendEntry.h b/src/sst/elements/firefly/nicShmemSendEntry.h
index 6e135bdaf..e15d6bb8c 100644
--- a/src/sst/elements/firefly/nicShmemSendEntry.h
+++ b/src/sst/elements/firefly/nicShmemSendEntry.h
@@ -60,13 +60,15 @@ class ShmemRespSendEntry: public ShmemCmdSendEntry {
     ShmemRespSendEntry( int local_vNic, NicShmemSendCmdEvent* event ) : 
         ShmemCmdSendEntry( local_vNic, event )
     {
-        assert( sizeof( m_hdr.respKey) == sizeof(m_event )); 
         m_hdr.vaddr = m_event->getFarAddr();
         m_hdr.length = m_event->getLength(); 
-        m_hdr.respKey = (size_t) this;
     }
     bool shouldDelete() { return false; }
 
+    void setRespKey( RespKey_t key ) {
+        m_hdr.respKey = key;
+    }
+
     size_t totalBytes() { return 0; } 
     bool isDone() { return true; }
     virtual void copyOut( Output&, int vc, int numBytes, 
diff --git a/src/sst/elements/firefly/nicShmemStream.cc b/src/sst/elements/firefly/nicShmemStream.cc
index 936527be0..774424a41 100644
--- a/src/sst/elements/firefly/nicShmemStream.cc
+++ b/src/sst/elements/firefly/nicShmemStream.cc
@@ -105,7 +105,7 @@ void Nic::RecvMachine::ShmemStream::processGetResp( ShmemMsgHdr& hdr, FireflyNet
     m_dbg.verbose(CALL_INFO,1,NIC_DBG_RECV_MACHINE,"SHMEM Operation %d respKey=%#" PRIx64 "\n",
             m_shmemHdr.op, m_shmemHdr.respKey);
 
-    ShmemRespSendEntry* entry = (ShmemRespSendEntry*)hdr.respKey;
+    ShmemRespSendEntry* entry = (ShmemRespSendEntry*) m_rm.nic().getRespKeyValue(hdr.respKey);
 
     if ( entry->getCmd()->type == NicShmemCmdEvent::Getv || 
            entry->getCmd()->type == NicShmemCmdEvent::Fadd || 
@@ -184,14 +184,12 @@ void Nic::RecvMachine::ShmemStream::processAdd( ShmemMsgHdr& hdr, FireflyNetwork
 	m_rm.nic().schedCallback( [=]() {
     	m_rm.nic().calcNicMemDelay( m_unit, memOps,
 			[=]() {
-#if 0
 				m_dbg.verbose(CALL_INFO,1,NIC_DBG_RECV_MACHINE,"processAdd() send Ack to %d\n",srcNode);
 				m_sendEntry = new ShmemAckSendEntry( local_vNic, srcNode, dest_vNic );
-#endif
+                // We are deleting this stream from this callback, is it safe?
     			m_rm.state_move_4( ev, this );
 			}
 		);
-		m_sendEntry = new ShmemAckSendEntry( local_vNic, srcNode, dest_vNic );
         m_rm.state_move_3( ev );
 	},
 	m_rm.nic().getShmemRxDelay_ns() );
diff --git a/src/sst/elements/firefly/shmem/barrier.cc b/src/sst/elements/firefly/shmem/barrier.cc
index e33d22d73..28af6cc81 100644
--- a/src/sst/elements/firefly/shmem/barrier.cc
+++ b/src/sst/elements/firefly/shmem/barrier.cc
@@ -39,7 +39,7 @@ void ShmemBarrier::start( int PE_start, int logPE_stride, int PE_size,
         m_num_children = full_tree_num_children();
         m_children = &full_tree_children()[0];    
     } else {
-        m_api.dbg().verbosePrefix( prefix(),CALL_INFO,1,SHMEM_BARRIER," part full tree\n");
+        m_api.dbg().verbosePrefix( prefix(),CALL_INFO,1,SHMEM_BARRIER," part tree\n");
         m_part_tree_children.resize( tree_radix() );
         m_children = &m_part_tree_children[0];
         m_common.build_kary_tree(tree_radix(), PE_start, 1 << logPE_stride , PE_size, 0, &m_parent, &m_num_children, m_children);
diff --git a/src/sst/elements/scheduler/simulations/emberLoad.py b/src/sst/elements/scheduler/simulations/emberLoad.py
index d6aa46bfc..50c9355dd 100644
--- a/src/sst/elements/scheduler/simulations/emberLoad.py
+++ b/src/sst/elements/scheduler/simulations/emberLoad.py
@@ -303,8 +303,8 @@ sst.merlin._params["xbar_bw"] = networkParams['link_bw']
 sst.merlin._params["flit_size"] = networkParams['flitSize'] 
 sst.merlin._params["input_latency"] = networkParams['input_latency'] 
 sst.merlin._params["output_latency"] = networkParams['output_latency'] 
-sst.merlin._params["input_buf_size"] = networkParams['buffer_size'] 
-sst.merlin._params["output_buf_size"] = networkParams['buffer_size'] 
+sst.merlin._params["input_buf_size"] = networkParams['input_buf_size'] 
+sst.merlin._params["output_buf_size"] = networkParams['output_buf_size'] 
 
 if rtrArb:
 	sst.merlin._params["xbar_arb"] = "merlin." + rtrArb 
diff --git a/src/sst/elements/scheduler/tests/refFiles/test_scheduler_DetailedNetwork.out b/src/sst/elements/scheduler/tests/refFiles/test_scheduler_DetailedNetwork.out
index f717b56c4..0680b8089 100644
--- a/src/sst/elements/scheduler/tests/refFiles/test_scheduler_DetailedNetwork.out
+++ b/src/sst/elements/scheduler/tests/refFiles/test_scheduler_DetailedNetwork.out
@@ -18,7 +18,7 @@
 10	32	27000	1.806452	384.000000	481036337152.000000
 11	16	18000	0.857143	24.000000	12884901888.000000
 12	16	18000	1.333333	128.000000	85899345920.000000
-5	256	54000	2.250000	82.000000	773094113280.000000
+5	256	54000	2.125000	64.000000	730144440320.000000
 6	256	54000	3.989216	5856.000000	69904887709696.000000
 8	128	45000	3.610236	2784.000000	15753940041728.000000
 # [Machine] 
@@ -31,16 +31,16 @@
 # Simple Task Mapper
 
 # Job 	Arrival	Start	End	Run	Wait	Resp.	Procs
-0	0	0	60092	60092	0	60092	288
-1	14600	60092	115109	55017	45492	100509	288
-2	255740	255740	314447	58707	0	58707	128
-3	266130	266130	323455	57325	0	57325	128
-9	295390	295390	328854	33464	0	33464	32
-12	305420	323455	343930	20475	18035	38510	16
-11	303040	323455	344464	21009	20415	41424	16
-7	280430	314447	355216	40769	34017	74786	64
-10	296160	323455	355962	32507	27295	59802	32
-4	273310	314447	356928	42481	41137	83618	64
-5	279680	356928	411099	54171	77248	131419	256
-6	279890	411099	465270	54171	131209	185380	256
-8	282550	465270	510373	45103	182720	227823	128
+0	0	0	60014	60014	0	60014	288
+1	14600	60014	114941	54927	45414	100341	288
+2	255740	255740	314421	58681	0	58681	128
+3	266130	266130	323428	57298	0	57298	128
+9	295390	295390	328827	33437	0	33437	32
+12	305420	323428	343903	20475	18008	38483	16
+11	303040	323428	344437	21009	20388	41397	16
+7	280430	314421	355200	40779	33991	74770	64
+4	273310	314421	355207	40786	41111	81897	64
+10	296160	323428	355953	32525	27268	59793	32
+5	279680	355207	410226	55019	75527	130546	256
+6	279890	410226	464326	54100	130336	184436	256
+8	282550	464326	509302	44976	181776	226752	128
diff --git a/src/sst/elements/zodiac/test/allreduce/allreduce.py b/src/sst/elements/zodiac/test/allreduce/allreduce.py
index 7ccfc3cc8..043252ea1 100644
--- a/src/sst/elements/zodiac/test/allreduce/allreduce.py
+++ b/src/sst/elements/zodiac/test/allreduce/allreduce.py
@@ -84,7 +84,8 @@ nicParams = ({
 		"module" : "merlin.linkcontrol",
 		"topology" : "merlin.torus",
 		"link_bw" : "4GB/s",
-		"buffer_size" : "1KB",
+		"input_buf_size" : "1KB",
+		"output_buf_size" : "1KB",
 		"packetSize" : netPktSizeBytes,
 		"rxMatchDelay_ns" : 100,
 		"txDelay_ns" : 100,
['src/sst/elements/firefly/nicMsgStream.h', 'src/sst/elements/firefly/nicMsgStream.cc', 'src/sst/elements/firefly/nicSendEntry.h', 'src/sst/elements/scheduler/tests/refFiles/test_scheduler_DetailedNetwork.out', 'src/sst/elements/zodiac/test/allreduce/allreduce.py', 'src/sst/elements/firefly/nicSendMachine.cc', 'src/sst/elements/firefly/nicRecvMachine.h', 'src/sst/elements/ember/test/defaultParams.py', 'src/sst/elements/firefly/nic.h', 'src/sst/elements/firefly/nic.cc', 'src/sst/elements/firefly/nicShmem.cc', 'src/sst/elements/ember/tests/refFiles/test_EmberSweep.out', 'src/sst/elements/firefly/nicShmemStream.cc', 'src/sst/elements/firefly/shmem/barrier.cc', 'src/sst/elements/scheduler/simulations/emberLoad.py', 'src/sst/elements/ember/test/emberLoad.py', 'src/sst/elements/ember/tests/refFiles/ESshmem_cumulative.out', 'src/sst/elements/firefly/nicShmemSendEntry.h']