diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt
index b506a59..44d493f 100644
--- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt
+++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt
@@ -28,7 +28,7 @@ abstract class BasePairingHelper(
     }
     // pairables sorted for pairing purposes
     protected val nameSortedPairables by lazy {
-        pairables.sortedWith(::nameSort)
+        pairables.sortedWith(::nameSort).toMutableList()
     }
 
     protected val pairablesMap by lazy {
diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/solver/BaseSolver.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/solver/BaseSolver.kt
index e225651..cf7260d 100644
--- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/solver/BaseSolver.kt
+++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/solver/BaseSolver.kt
@@ -40,7 +40,7 @@ sealed class BaseSolver(
 
     open fun weight(p1: Pairable, p2: Pairable) =
         openGothaWeight(p1, p2) +
-        //pairing.base.applyByeWeight(p1, p2) +
+        // pairing.base.applyByeWeight(p1, p2) +
         pairing.handicap.color(p1, p2)
 
     fun pair(): List<Game> {
@@ -59,9 +59,28 @@ sealed class BaseSolver(
             // println("placement criteria" + placement.criteria.toString())
         }
 
+        var chosenByePlayer: Pairable = ByePlayer
+        // Choose bye player and remove from pairables
+        if (ByePlayer in nameSortedPairables){
+            nameSortedPairables.remove(ByePlayer)
+            var minWeight = 1000.0*round + (Pairable.MAX_RANK - Pairable.MIN_RANK) + 1;
+            var weightForBye : Double
+            var byePlayerIndex = 0
+            for (p in nameSortedPairables){
+                weightForBye = p.rank + 2*p.main
+                if (weightForBye <= minWeight){
+                    minWeight = weightForBye
+                    chosenByePlayer = p
+                }
+                println("choose Bye: " + p.nameSeed() + " " + weightForBye)
+            }
+            println("Bye player : " + chosenByePlayer.nameSeed())
+            nameSortedPairables.remove(chosenByePlayer)
+        }
+
         for (i in nameSortedPairables.indices) {
             // println(nameSortedPairables[i].nameSeed() + " id="+nameSortedPairables[i].id.toString()+" clasmt="+nameSortedPairables[i].placeInGroup.toString())
-            for (j in i + 1 until pairables.size) {
+            for (j in i + 1 until nameSortedPairables.size) {
                 val p = nameSortedPairables[i]
                 val q = nameSortedPairables[j]
                 weight(p, q).let { if (it != Double.NaN) builder.addEdge(p, q, it) }
@@ -80,6 +99,7 @@ sealed class BaseSolver(
                     File(WEIGHTS_FILE).appendText("secHandiCost="+dec.format(pairing.handicap.handicap(p, q))+"\n")
                     File(WEIGHTS_FILE).appendText("secGeoCost="+dec.format(pairing.geo.apply(p, q))+"\n")
                     File(WEIGHTS_FILE).appendText("totalCost="+dec.format(openGothaWeight(p,q))+"\n")
+                    //File(WEIGHTS_FILE).appendText("ByeCost="+dec.format(pairing.base.applyByeWeight(p,q))+"\n")
 
                 }
             }
@@ -92,8 +112,13 @@ sealed class BaseSolver(
             listOf(graph.getEdgeSource(it), graph.getEdgeTarget(it))
         }.sortedWith(compareBy({ min(it[0].place, it[1].place) }))
 
+/*        println(sorted.size)
+        if (chosenByePlayer != ByePlayer) sorted.add(listOf(chosenByePlayer, ByePlayer))
+        println(sorted.size)*/
+
         val result = sorted.flatMap { games(white = it[0], black = it[1]) }
 
+
         if (DEBUG_EXPORT_WEIGHT) {
             var sumOfWeights = 0.0
             for (it in sorted) {
@@ -165,8 +190,9 @@ sealed class BaseSolver(
             val actualPlayer = if (p1.id == ByePlayer.id) p2 else p1
             // TODO maybe use a different formula than opengotha
             val x = (actualPlayer.rank - Pairable.MIN_RANK + actualPlayer.main) / (Pairable.MAX_RANK - Pairable.MIN_RANK + mainLimits.second)
-            concavityFunction(x, BaseCritParams.MAX_BYE_WEIGHT)
-            BaseCritParams.MAX_BYE_WEIGHT - (actualPlayer.rank + 2*actualPlayer.main)
+            //concavityFunction(x, BaseCritParams.MAX_BYE_WEIGHT)
+            //BaseCritParams.MAX_BYE_WEIGHT - (actualPlayer.rank + 2*actualPlayer.main)
+            BaseCritParams.MAX_BYE_WEIGHT*(1 - x)
         } else {
             0.0
         }
diff --git a/api-webapp/src/test/kotlin/PairingTests.kt b/api-webapp/src/test/kotlin/PairingTests.kt
index a72503d..f07f1cd 100644
--- a/api-webapp/src/test/kotlin/PairingTests.kt
+++ b/api-webapp/src/test/kotlin/PairingTests.kt
@@ -253,10 +253,11 @@ class PairingTests: TestBase() {
         val byePlayerList = mutableListOf<Long>(354, 359, 356, 357, 345, 339, 368, 344, 349, 341)
 
         for (round in 1..7) {
-            games = TestAPI.post("/api/tour/$id/pair/$round", Json.Array(playersList.filter{it != byePlayerList[round-1]})).asArray()
+            //games = TestAPI.post("/api/tour/$id/pair/$round", Json.Array(playersList.filter{it != byePlayerList[round-1]})).asArray()
+            games = TestAPI.post("/api/tour/$id/pair/$round", Json.Array("all")).asArray()
             logger.info("games for round $round: {}", games.toString())
 
-            assertTrue(compare_weights("weights.txt", "opengotha/notsosimpleswiss_weights_R$round.txt"), "Not matching opengotha weights for round $round")
+            assertTrue(compare_weights("weights.txt", "opengotha/notsosimpleswiss_weights_nobye_R$round.txt"), "Not matching opengotha weights for round $round")
             assertTrue(compare_games(games, Json.parse(pairings[round - 1])!!.asArray()),"pairings for round $round differ")
             logger.info("Pairings for round $round match OpenGotha")