Index: /bidspace/pom.xml
===================================================================
--- /bidspace/pom.xml	(revision 31)
+++ /bidspace/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>bidspace</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -22,5 +22,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -114,5 +114,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /boa/pom.xml
===================================================================
--- /boa/pom.xml	(revision 31)
+++ /boa/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>boa</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -90,5 +90,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /collectparties.sh
===================================================================
--- /collectparties.sh	(revision 31)
+++ /collectparties.sh	(revision 32)
@@ -7,5 +7,5 @@
 rm -rf collectedparties
 mkdir collectedparties
-VERSION=1.6.0
+VERSION=1.6.1
 
 cp "exampleparties/anac2019/agentgg/target/agentgg-${VERSION}-jar-with-dependencies.jar" collectedparties
Index: /events/bin/pom.xml
===================================================================
--- /events/bin/pom.xml	(revision 32)
+++ /events/bin/pom.xml	(revision 32)
@@ -0,0 +1,260 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>geniusweb</groupId>
+	<artifactId>events</artifactId>
+	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<packaging>jar</packaging>
+
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<basedir>.</basedir>
+		<passwd>${env.ARTIFACTORY_PASS}</passwd>
+		<jackson-2-version>2.9.10</jackson-2-version>
+		<geniusweb.version>1.6.0</geniusweb.version>
+	</properties>
+
+	<distributionManagement>
+		<repository>
+			<id>artifactory.ewi.tudelft.nl</id>
+			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+		</repository>
+	</distributionManagement>
+
+	<repositories>
+		<repository>
+			<id>artifactory.ewi.tudelft.nl</id>
+			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>timeline</artifactId>
+			<version>${geniusweb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>issuevalue</artifactId>
+			<version>${geniusweb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>references</artifactId>
+			<version>${geniusweb.version}</version>
+		</dependency>
+
+		<!-- the core, which includes Streaming API, shared low-level abstractions 
+			(but NOT data-binding) -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+
+		<!-- Just the annotations; use this dependency if you want to attach annotations 
+			to classes without connecting them to the code. -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+
+		<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+
+		<!-- smile (binary JSON). Other artifacts in this group do other formats. -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-smile</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+		<!-- JAX-RS provider -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+		<!-- Support for JAX-B annotations as additional configuration -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>${jackson-2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.9.5</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>tudelft.utilities</groupId>
+			<artifactId>junit</artifactId>
+			<version>1.0.5</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>central</id>
+			<url>https://repo1.maven.org/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>jfrog-plugins-release</id>
+			<name>plugins-release</name>
+			<url>https://oss.jfrog.org/artifactory/plugins-release</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+
+
+	<build>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.jfrog.buildinfo</groupId>
+				<artifactId>artifactory-maven-plugin</artifactId>
+				<version>2.6.1</version>
+				<executions>
+					<execution>
+						<id>build-info</id>
+						<goals>
+							<goal>publish</goal>
+						</goals>
+						<configuration>
+							<publisher>
+								<contextUrl>http://artifactory.ewi.tudelft.nl/artifactory</contextUrl>
+								<repoKey>libs-release</repoKey>
+								<username>wouter</username>
+								<password>${passwd}</password>
+							</publisher>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.4.1</version>
+				<configuration>
+					<!-- get all project dependencies -->
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<!-- bind to the packaging phase -->
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+
+		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.jfrog.buildinfo</groupId>
+										<artifactId>artifactory-maven-plugin</artifactId>
+										<versionRange>[1.0.0,)</versionRange>
+										<goals>
+											<goal>publish</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
+
+	</build>
+
+</project>
Index: /events/pom.xml
===================================================================
--- /events/pom.xml	(revision 31)
+++ /events/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>events</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -30,5 +30,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /events/src/main/java/geniusweb/actions/FileLocation.java
===================================================================
--- /events/src/main/java/geniusweb/actions/FileLocation.java	(revision 31)
+++ /events/src/main/java/geniusweb/actions/FileLocation.java	(revision 32)
@@ -11,10 +11,10 @@
 /**
  * This contains a "system independent" {@link File}. This is represented by a
- * {@link UUID}. The file may or may not yet exist (depending on whether your
- * party already wrote some contents in that file in previous runs), may or may
- * not be empty (your choice), and can contain any type of data. The original
- * intent of this is that parties can store learned data in this file, while the
- * name can be kept for later re-use in later runs (eg negotiation sessions) on
- * the same machine.
+ * {@link UUID}. See {@link #getFile()} to get the file referenced by this. The
+ * file may or may not yet exist (depending on whether your party already wrote
+ * some contents in that file in previous runs), may or may not be empty (your
+ * choice), and can contain any type of data. The original intent of this is
+ * that parties can store learned data in this file, while the name can be kept
+ * for later re-use in later runs (eg negotiation sessions) on the same machine.
  * <p>
  * This file is to be used locally on some other machine (typically a
@@ -66,4 +66,12 @@
 	}
 
+	/**
+	 * 
+	 * @return Actual file that can be used for read/write operations. This file
+	 *         usually resides in the geniusweb folder inside the java.io.tmpdir
+	 *         system property. This temp dir depends on the run configuration,
+	 *         eg some directory inside the user's home directory, or a temp
+	 *         folder inside tomcat.
+	 */
 	public File getFile() {
 		return Paths.get(TMP, GENIUSWEB, name.toString()).toFile();
Index: /exampleparties/anac2019/agentgg/pom.xml
===================================================================
--- /exampleparties/anac2019/agentgg/pom.xml	(revision 31)
+++ /exampleparties/anac2019/agentgg/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties.anac2019</groupId>
 	<artifactId>agentgg</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.6</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -135,5 +135,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/anac2019/winkyagent/pom.xml
===================================================================
--- /exampleparties/anac2019/winkyagent/pom.xml	(revision 31)
+++ /exampleparties/anac2019/winkyagent/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties.anac2019</groupId>
 	<artifactId>winkyagent</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.6</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -135,5 +135,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/boulware/pom.xml
===================================================================
--- /exampleparties/boulware/pom.xml	(revision 31)
+++ /exampleparties/boulware/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>boulware</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -48,5 +48,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/comparebids/pom.xml
===================================================================
--- /exampleparties/comparebids/pom.xml	(revision 31)
+++ /exampleparties/comparebids/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>comparebids</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.6</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -130,5 +130,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/conceder/pom.xml
===================================================================
--- /exampleparties/conceder/pom.xml	(revision 31)
+++ /exampleparties/conceder/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>conceder</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -48,5 +48,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/hardliner/pom.xml
===================================================================
--- /exampleparties/hardliner/pom.xml	(revision 31)
+++ /exampleparties/hardliner/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>hardliner</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -48,5 +48,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/humangui/pom.xml
===================================================================
--- /exampleparties/humangui/pom.xml	(revision 31)
+++ /exampleparties/humangui/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>humangui</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.6</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -124,5 +124,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/linear/pom.xml
===================================================================
--- /exampleparties/linear/pom.xml	(revision 31)
+++ /exampleparties/linear/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>linear</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -48,5 +48,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/randomparty/pom.xml
===================================================================
--- /exampleparties/randomparty/pom.xml	(revision 31)
+++ /exampleparties/randomparty/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>randomparty</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.6</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -130,5 +130,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/randompartypy/pom.xml
===================================================================
--- /exampleparties/randompartypy/pom.xml	(revision 31)
+++ /exampleparties/randompartypy/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>randompyparty</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -121,5 +121,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/simpleboa/pom.xml
===================================================================
--- /exampleparties/simpleboa/pom.xml	(revision 31)
+++ /exampleparties/simpleboa/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>simpleboaparty</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.6</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -68,5 +68,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/simpleshaop/pom.xml
===================================================================
--- /exampleparties/simpleshaop/pom.xml	(revision 31)
+++ /exampleparties/simpleshaop/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>simpleshaop</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.6</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -130,5 +130,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /exampleparties/timedependentparty/pom.xml
===================================================================
--- /exampleparties/timedependentparty/pom.xml	(revision 31)
+++ /exampleparties/timedependentparty/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>timedependentparty</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -130,5 +130,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /ip/pom.xml
===================================================================
--- /ip/pom.xml	(revision 31)
+++ /ip/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>ip</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -47,5 +47,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /issuevalue/pom.xml
===================================================================
--- /issuevalue/pom.xml	(revision 31)
+++ /issuevalue/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>issuevalue</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -102,5 +102,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /opponentmodel/pom.xml
===================================================================
--- /opponentmodel/pom.xml	(revision 31)
+++ /opponentmodel/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>opponentmodel</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -123,5 +123,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /party/pom.xml
===================================================================
--- /party/pom.xml	(revision 31)
+++ /party/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>party</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -128,5 +128,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /profile/pom.xml
===================================================================
--- /profile/pom.xml	(revision 31)
+++ /profile/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>profile</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -113,5 +113,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /profileconnection/pom.xml
===================================================================
--- /profileconnection/pom.xml	(revision 31)
+++ /profileconnection/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>profileconnection</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -117,5 +117,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /protocol/pom.xml
===================================================================
--- /protocol/pom.xml	(revision 31)
+++ /protocol/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>protocol</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -137,5 +137,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /protocol/src/main/java/geniusweb/protocol/session/learn/LearnSettings.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/session/learn/LearnSettings.java	(revision 31)
+++ /protocol/src/main/java/geniusweb/protocol/session/learn/LearnSettings.java	(revision 32)
@@ -9,5 +9,4 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import geniusweb.actions.FileLocation;
@@ -27,6 +26,4 @@
 	private final List<TeamInfo> participants;
 	private final Deadline deadline;
-
-	private final static ObjectMapper jackson = new ObjectMapper();
 
 	/**
Index: /protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsSettings.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsSettings.java	(revision 31)
+++ /protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsSettings.java	(revision 32)
@@ -135,4 +135,12 @@
 	}
 
+	/**
+	 * 
+	 * @return number of times the entire tournament is repeated, &gt;0
+	 */
+	public int getNrTournaments() {
+		return this.numberTournaments;
+	}
+
 	@Override
 	public TournamentProtocol getProtocol(Reporter logger) {
@@ -151,6 +159,9 @@
 		ImmutableList<ProfileList> profileslist = new FixedList<ProfileList>(
 				profileslists);
-		partylistlist = getParticipants(partieslist, profileslist,
+		partylistlist = getParticipantsOneTournament(partieslist, profileslist,
 				teamsPerSession, reuseTeams);
+		partylistlist = new Repeat<ImmutableList<TeamInfo>>(partylistlist,
+				BigInteger.valueOf(numberTournaments), true);
+
 		return new MapList<>(partyproflist -> createSetting(partyproflist),
 				partylistlist);
@@ -241,5 +252,5 @@
 	 *         drawn with replace.
 	 */
-	protected ImmutableList<ImmutableList<TeamInfo>> getParticipants(
+	protected ImmutableList<ImmutableList<TeamInfo>> getParticipantsOneTournament(
 			ImmutableList<Team> parties, ImmutableList<ProfileList> profiles,
 			int n, boolean drawPartyWithPutback) {
@@ -260,8 +271,6 @@
 				partiesPermutations, profilesPermutations);
 
-		MapList<Tuple<ImmutableList<Team>, ImmutableList<ProfileList>>, ImmutableList<TeamInfo>> tournamentsettings = new MapList<Tuple<ImmutableList<Team>, ImmutableList<ProfileList>>, ImmutableList<TeamInfo>>(
+		return new MapList<Tuple<ImmutableList<Team>, ImmutableList<ProfileList>>, ImmutableList<TeamInfo>>(
 				tuple -> teamlist(tuple), tuples);
-		return new Repeat<ImmutableList<TeamInfo>>(tournamentsettings,
-				BigInteger.valueOf(numberTournaments), true);
 	}
 
Index: /protocol/src/main/java/geniusweb/protocol/tournament/allpermutationslearn/AllPermutationsLearnSettings.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/tournament/allpermutationslearn/AllPermutationsLearnSettings.java	(revision 31)
+++ /protocol/src/main/java/geniusweb/protocol/tournament/allpermutationslearn/AllPermutationsLearnSettings.java	(revision 32)
@@ -118,6 +118,13 @@
 	@Override
 	public ImmutableList<SessionSettings> permutations() {
-		ImmutableList<SessionSettings> allsessionsettings = super.permutations();
-		if (allsessionsettings.size()
+
+		ImmutableList<ImmutableList<TeamInfo>> partylistlist;
+		ImmutableList<Team> partieslist = new FixedList<Team>(teams);
+		ImmutableList<ProfileList> profileslist = new FixedList<ProfileList>(
+				profileslists);
+		partylistlist = getParticipantsOneTournament(partieslist, profileslist,
+				teamsPerSession, reuseTeams);
+
+		if (partylistlist.size().multiply(BigInteger.valueOf(numberTournaments))
 				.compareTo(BigInteger.valueOf(MAX_SESSIONS)) > 0)
 			throw new IllegalArgumentException(
@@ -125,19 +132,19 @@
 							+ MAX_SESSIONS);
 
-		FixedList<FixedList<FileLocation>> filelocs = createFileLocations(
-				allsessionsettings.size().longValue());
-
-		ImmutableList<ImmutableList<TeamInfo>> partylistlist;
-		ImmutableList<Team> partieslist = new FixedList<Team>(teams);
-		ImmutableList<ProfileList> profileslist = new FixedList<ProfileList>(
-				profileslists);
-		partylistlist = getParticipants(partieslist, profileslist,
-				teamsPerSession, reuseTeams);
-		ImmutableList<SessionSettings> settings = new MapThreadList<>(
-				(parties, flocs) -> createSetting(parties, flocs),
-				partylistlist, filelocs);
-
-		return new JoinedList<SessionSettings>(settings,
-				getLearnSessions(filelocs, partylistlist));
+		// we have to generate separate filelocations for each session...
+		ImmutableList<SessionSettings> allSettings = null;
+		for (int tournamentnr = 0; tournamentnr < getNrTournaments(); tournamentnr++) {
+			FixedList<FixedList<FileLocation>> filelocs = createFileLocations(
+					partylistlist.size().longValue());
+			ImmutableList<SessionSettings> settings = new MapThreadList<>(
+					(parties, flocs) -> createSetting(parties, flocs),
+					partylistlist, filelocs);
+			settings = new JoinedList<SessionSettings>(settings,
+					getLearnSessions(filelocs, partylistlist));
+			allSettings = allSettings == null ? settings
+					: new JoinedList<SessionSettings>(allSettings, settings);
+		}
+
+		return allSettings;
 	}
 
Index: /protocol/src/test/java/geniusweb/protocol/tournament/allpermutationslearn/AllPermutationsLearnSettingsTest.java
===================================================================
--- /protocol/src/test/java/geniusweb/protocol/tournament/allpermutationslearn/AllPermutationsLearnSettingsTest.java	(revision 31)
+++ /protocol/src/test/java/geniusweb/protocol/tournament/allpermutationslearn/AllPermutationsLearnSettingsTest.java	(revision 32)
@@ -219,4 +219,6 @@
 		// #permutations + 1 training session
 		assertEquals(7, settings.permutations().size().intValue());
+		// 2* settings because 2 tournaments
+		assertEquals(14, settings5.permutations().size().intValue());
 	}
 
@@ -231,8 +233,11 @@
 				parties3, profiles, false, 2, saopsettings, 2, learnsettings);
 		ImmutableList<SessionSettings> perms = settings3parties.permutations();
-		// 3 parties, 3 profiles, 2 parties per session, 2 tournaments = 2*18
-		assertEquals(37, perms.size().intValue());
+		// 3 parties, 3 profiles, 2 parties per session, = 18 , + 1 learn, *2
+		// tournaments
+		assertEquals(38, perms.size().intValue());
+
+		// get the last setting, which must be a LearnSetting.
 		LearnSettings learnsetting = (LearnSettings) perms
-				.get(BigInteger.valueOf(36));
+				.get(BigInteger.valueOf(37));
 		assertEquals(3, learnsetting.getAllParties().size());
 		Parameters party1params = learnsetting.getAllParties().get(0).getParty()
@@ -241,5 +246,5 @@
 				party1params.get("persistentstate").toString());
 		List negodata = (List) party1params.get("negotiationdata");
-		assertEquals(24, negodata.size());
+		assertEquals(12, negodata.size());
 	}
 
Index: /pythonadapter/pom.xml
===================================================================
--- /pythonadapter/pom.xml	(revision 31)
+++ /pythonadapter/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>pythonadapter</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -49,5 +49,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /references/pom.xml
===================================================================
--- /references/pom.xml	(revision 31)
+++ /references/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>references</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -107,5 +107,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /simplerunner/pom.xml
===================================================================
--- /simplerunner/pom.xml	(revision 31)
+++ /simplerunner/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>simplerunner</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -87,5 +87,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /timeline/pom.xml
===================================================================
--- /timeline/pom.xml	(revision 31)
+++ /timeline/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>timeline</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -22,5 +22,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -95,5 +95,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
Index: /voting/pom.xml
===================================================================
--- /voting/pom.xml	(revision 31)
+++ /voting/pom.xml	(revision 32)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>voting</artifactId>
-	<version>1.6.0</version> <!-- must equal ${geniusweb.version} -->
+	<version>1.6.1</version> <!-- must equal ${geniusweb.version} -->
 	<packaging>jar</packaging>
 
@@ -17,5 +17,5 @@
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
 		<jackson-2-version>2.9.10</jackson-2-version>
-		<geniusweb.version>1.6.0</geniusweb.version>
+		<geniusweb.version>1.6.1</geniusweb.version>
 	</properties>
 
@@ -23,5 +23,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 		</repository>
 	</distributionManagement>
@@ -112,5 +112,5 @@
 		<repository>
 			<id>artifactory.ewi.tudelft.nl</id>
-			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<url>https://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
 			<snapshots>
 				<enabled>false</enabled>
