diff --git a/local/epfl/check-scipers b/local/epfl/check-scipers
index 6710c15..813be6e 100755
--- a/local/epfl/check-scipers
+++ b/local/epfl/check-scipers
@@ -1,116 +1,163 @@
 #!/usr/bin/env php
 <?php
 
 require_once(dirname(__FILE__).'/lib/lib_sel.php');
 
 $shortopts = '';
 $shortopts .= 'h';
 
 $longopts = array(
 	'hostname:',
 	'port:',
 	'help',
 	'iformat:',
 	'ifile:',
 	'oformat:',
 	'iseparator:',
 	'oseparator:',
 	'name:',
+	'oversions:',
+	'oextras:'
 	);
 
 $options = getopt($shortopts, $longopts);
 
 # Check mandatory parameters
 $show_help = false;
 $show_help |= (empty($options['ifile']));
 $show_help |= (array_key_exists('h', $options) or array_key_exists('help', $options));
 
 if ($show_help) {
 	echo "USAGE: ".basename(__FILE__)."
 \t\t[--hostname ldap.epfl.ch --port 389] (LDAP hostname and port)
-\t\t[--iformat \"SCIPER,NAME\"] (input CSV format)
+\t\t[--iformat \"NAME,SCIPER\"] (input CSV format)
 \t\t--ifile \"input_file.csv\" (input file)
 \t\t[--iseparator \",\"] (CSV separator used in input file and --iformat)
 \t\t[--oformat \"ID,SCIPER,NAME,SECTION,EMAIL,STATUS\"] (output CSV format)
 \t\t[--oseparator \",\"] (CSV separator used in output file and --oformat)
+\t\t[--oversions \",\"] (Versions of the exams - e.g. \"A\")
+\t\t[--oextras \",\"] (Number of spare exams to add - e.g. \"9\")
 \t\t[-h|--help]"."\n";
 	exit;
 }
 
 if (empty($options['hostname']))	$options['hostname'] = null;
 if (empty($options['port']))		$options['port'] = null;
-if (empty($options['iformat']))		$options['iformat'] = 'SCIPER,NAME';
+if (empty($options['iformat']))		$options['iformat'] = 'NAME,SCIPER';
 if (empty($options['oformat']))		$options['oformat'] = 'ID,SCIPER,NAME,SECTION,EMAIL,STATUS';
 if (empty($options['iseparator']))	$options['iseparator'] = ',';
 if (empty($options['oseparator']))	$options['oseparator'] = ',';
+if (empty($options['oversions']))	$options['oversions'] = 'A';
+if (empty($options['oextras']))		$options['oextras'] = '0';
 
+# Convert versions to a table.
+$options['oversions'] = str_split(trim($options['oversions']));
+$nb_of_versions = count($options['oversions']);
 
 $iformat = array_flip(array_map("strtolower", explode($options['iseparator'], $options['iformat'])));
 $oformat = array_flip(array_map("strtolower", explode($options['oseparator'], $options['oformat'])));
 
 # check file exists
 if (!is_file($options['ifile'])) {
 	echo "File not found: ".$options['ifile']."\n";
 	exit;
 }
 
 # read file
 $idata = file($options['ifile'], FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
 
 # remove header if present
 if ($idata[0] == $options['iformat']) array_shift($idata);
 
 # print output header
 echo $options['oformat']."\n";
 
 $LDAP = new EPFL_LDAP($options['hostname'], $options['port']);
 
 # process lines
 foreach ($idata as $i => $iline) {
 	$iline = explode($options['iseparator'], $iline);
+
 	// Format input_student
 	$input_student = array();
 	foreach (array_keys($oformat) as $key) {
 		switch ($key) {
 		case 'id':
 			$input_student[$key] = $i+1;
 			break;
 		default:
 			if (array_key_exists($key, $iformat)) {
 				$input_student[$key] = $iline[$iformat[$key]];
 			} else {
 				$input_student[$key] = null;
 			}
 		}
 	}
-	$input_student['email'] = 'n/a';
+	# Add empty email if needed
+	if (array_key_exists('email', $input_student) and is_null($input_student['email'])) $input_student['email'] = 'n/a';
+
+	# Add version number if needed
+	if (array_key_exists('version', $input_student) and is_null($input_student['version'])) {
+		$input_student['version'] = $options['oversions'][($input_student['id']-1) % $nb_of_versions];
+	}
 
 	# fetch LDAP data
 	$LDAP->find_by_sciper($input_student['sciper'], 'student', 1);
 	$output_student = $LDAP->get_entries();
 	if (count($output_student) == 1) { 
 		$output_student = $output_student[0];
 	} else {
 		$output_student = array( 'found' => 0 );
 	}
 
 	# add some info
 	if ((bool)$output_student['found']) {
 		$output_student['status'] = 'OK';
 	} else {
 		$output_student['status'] = 'NOT FOUND';
 	}
 
 	# Merge info
 	$merged_student = array_merge($input_student, $output_student);
 
 	# Print line
 	$oline = array();
 	foreach (array_keys($oformat) as $key) $oline[] = $merged_student[$key];
 	echo implode($options['oseparator'], $oline)."\n";
+}
 
+# Add extra students
+$nb_of_extra_exams = $options['oextras'];
+$first_extra_id = $i+2;
+$current_extra = 1;
+for ($extra_id = $first_extra_id; $extra_id < $first_extra_id+$nb_of_extra_exams; $extra_id++) {
+	$oline = array();
+	foreach (array_keys($oformat) as $key) {
+		switch ($key) {
+			case 'id':
+				$oline[] = $extra_id;
+				break;
+			case 'sciper':
+				$oline[] = 999000 + $current_extra;
+				break;
+			case 'name':
+				$oline[] = 'Spare-'.$current_extra;
+				break;
+			case 'section':
+				$oline[] = 'XXX';
+				break;
+			case 'version':
+				$oline[] = $options['oversions'][($extra_id-1) % $nb_of_versions];
+				break;
+			default:
+				$oline[] = 'n/a';
+				break;
+		}
+	}
+	$current_extra++;
+	echo implode($options['oseparator'], $oline)."\n";
 }
 
 exit;
 
 ?>