diff --git a/ag/gm/gm_seite.php b/ag/gm/gm_seite.php
index 54a3621..6072c4c 100644
--- a/ag/gm/gm_seite.php
+++ b/ag/gm/gm_seite.php
@@ -251,7 +251,7 @@ if(checkLoginData($_SESSION['user'],$_SESSION['password'])){
 	}	else if($_REQUEST['choose'] == 'usergroups'){
 		displayUserGroups($_REQUEST['action'] ,$_REQUEST['uname'] ,$_REQUEST['ugname'], $_REQUEST['delete'], $_REQUEST['add']);
 	} else if($_REQUEST['choose'] == 'tournament'){
-		displayTournamentOptions($_REQUEST['action']);
+		displayTournamentOptions($_REQUEST['action'], $_REQUEST['klein'], $_REQUEST['wochen']);
 	}else {	
 		displayOptions();
 	}
diff --git a/ag/gm/include/tournament.inc.php b/ag/gm/include/tournament.inc.php
index ed5c693..9f96687 100644
--- a/ag/gm/include/tournament.inc.php
+++ b/ag/gm/include/tournament.inc.php
@@ -6,24 +6,20 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public Licence
  *
  */
-
-print_r($_GET);
 ?>
 <?php
-function displayTournamentOptions($action) {
-	/*if($action === "starttnmt") {
-	 if(is_numeric($_REQUEST['anzahl']) && is_numeric($_REQUEST['minlevel']) && is_numeric($_REQUEST['maxlevel'])
-	 && is_numeric($_REQUEST['grp_size']) && is_numeric($_REQUEST['grp_proceed'])) {
-	 include_once($_SERVER['DOCUMENT_ROOT'].'cronjob/generic_turnier.php');
-	 } else {
-	 echo 'Keine gültige Eingabe<br>';
-	 echo '<a href="'.$_SERVER['PHP_SELF'].'?choose=tournament">Zur&uuml;ck</a>';
-	 }
-	 } else {*/
-	?>
-<!-- <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="GET" onSubmit="start();">
-	<input type="hidden" name="choose" value="tournament"> <input
-		type="hidden" name="action" value="starttnmt"> -->
+function displayTournamentOptions($action, $klein, $wochen) {
+	if($action == 'starttnmt') {
+		/*if($action === "starttnmt") {
+		 if(is_numeric($_REQUEST['anzahl']) && is_numeric($_REQUEST['minlevel']) && is_numeric($_REQUEST['maxlevel'])
+		 && is_numeric($_REQUEST['grp_size']) && is_numeric($_REQUEST['grp_proceed'])) {
+		 include_once($_SERVER['DOCUMENT_ROOT'].'cronjob/generic_turnier.php');
+		 } else {
+		 echo 'Keine gültige Eingabe<br>';
+		 echo '<a href="'.$_SERVER['PHP_SELF'].'?choose=tournament">Zur&uuml;ck</a>';
+		 }
+		 } else {*/
+		?>
 <table width="80%">
 	<tr>
 		<th colspan="2"><h1 style="text-align: center">Übersicht</h1></th>
@@ -99,14 +95,14 @@ function displayTournamentOptions($action) {
 		<td style="text-align: center"><input name="grp_proceed" value="0"></td>
 	</tr>
 	<tr>
-		<td align="center" colspan="2"><a href="include/tournament.inc.php"
-			target="_blank">Turnier starten!</a></td>
-		<!-- <td align="center" colspan="2"><input type="submit" value="start" />
-			<?php $_SERVER['DOCUMENT_ROOT'].'cronjob/generic_turnier.php'?>
-			</td> -->
+		<td align="center" colspan="2">
+			<a href="<?php $_SERVER['DOCUMENT_ROOT'].'cronjob/generic_turnier.php'?>"
+			target="_blank">Turnier starten!</a>
+		</td>
 	</tr>
 	<tr>
-		<td><br>
+		<td align="center" colspan="2">
+		<a href="<?php echo $_SERVER['PHP_SELF'].'?choose=tournament'; ?>">Zur&uuml;ck</a>
 		</td>
 	</tr>
 	<tr>
@@ -114,10 +110,110 @@ function displayTournamentOptions($action) {
 			href="<?php echo $_SERVER['PHP_SELF']; ?>">Zum Hauptmenu</a>
 		</td>
 	</tr>
-
 </table>
-<!-- </form> -->
 			<?php
+	} else if($action == 'fee') {
+		$qry = mysql_query('SELECT * FROM turnier_gebuehr;');
+		while ($fee = mysql_fetch_assoc($qry)) {			
+			if($fee['art'] == 'wochen') {
+				$fee_wochen = $fee['gebuehr'];
+			} else if($fee['art'] == 'klein') {
+				$fee_klein = $fee['gebuehr'];	
+			}
+		}
+		
+		$change = FALSE;
+		if($klein !== NULL || $wochen !== null) {
+			if($klein !== NULL && $klein != $fee_klein) {
+				$change = TRUE;
+				mysql_query('UPDATE turnier_gebuehr SET gebuehr = '.$klein.' WHERE art = \'klein\'');
+				$fee_klein = $klein;
+			}
+			if($wochen !== NULL && $wochen != $fee_wochen) {
+				$change = TRUE;
+				mysql_query('UPDATE turnier_gebuehr SET gebuehr = '.$wochen.' WHERE art = \'wochen\'');
+				$fee_wochen = $wochen;
+			}
+		}
+		?>
+<form  method="get">
+<input type="hidden" name="choose" value="tournament">
+<input type="hidden" name="action" value="fee">
+<table width="80%">
+	<tr>
+		<th colspan="2"><h1 style="text-align: center">Übersicht</h1></th>
+	</tr>
+		<?php if($change === TRUE) {?>
+		<tr>
+			<td colspan="2" align="center">
+				&Auml;nderungen &uuml;bernommen!
+			</td>
+		</tr>
+		<?php }?>
+		<tr>
+			<td colspan="2" align="center">
+				<b>Anf&auml;ngerturnier</b>
+			</td>
+		</tr>		
+		<tr>
+			<td align="left">
+			Anmeldegeb&uuml;hr:
+			</td>
+			<td>
+			<input type="text" name="klein" value=<?php echo $fee_klein;?>>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2" align="center">
+				<b>Wochenturnier</b>
+			</td>
+		</tr>
+		<tr>
+			<td align="left">
+			Anmeldegeb&uuml;hr:
+			</td>
+			<td>
+			<input type="text" name="wochen" value=<?php echo $fee_wochen;?>>
+			</td>
+		</tr>
+		<tr>
+			<td align="center" colspan="2">
+				<input type="submit" value="&auml;ndern">
+			</td>
+		</tr>
+		<tr>
+			<td align="center" colspan="2">
+				<a href="<?php echo $_SERVER['PHP_SELF'].'?choose=tournament'; ?>">Zur&uuml;ck</a>
+			</td>
+		</tr>
+		<tr>
+			<td align="center" colspan="2">
+			<a href="<?php echo $_SERVER['PHP_SELF']; ?>">Zum Hauptmenu</a>
+			</td>
+		</tr>
+</table>
+</form>
+	<?php 
+	} else {
+		?>
+<table>
+	<tr>
+		<td>
+		<a href="<?php $_SERVER['PHP_SELF'] ?>?choose=tournament&action=starttnmt">Turnier	starten (in Arbeit)</a>
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<a href="<?php $_SERVER['PHP_SELF'] ?>?choose=tournament&action=fee"> Anmeldegebühren bearbeiten</a>
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<a href="<?php echo $_SERVER['PHP_SELF']; ?>">Zum Hauptmenu</a>
+		</td>
+	</tr>
+</table>
+		<?php
+	}
 }
-//}
 ?>
\ No newline at end of file
diff --git a/ag/turnier.php b/ag/turnier.php
index 553a50f..b1d1264 100644
--- a/ag/turnier.php
+++ b/ag/turnier.php
@@ -33,6 +33,14 @@ function anmelden($user, $charid, $art){
 	}
 	// Es wird angenommen, dass $user schon sicher ist, weil das in der config.inc.php ausgelesen wird
 	
+	$gebuehr = mysql_fetch_assoc(mysql_query('SELECT gebuehr FROM turnier_gebuehr WHERE art = \''.$art.'\';'));
+	$gebuehr = $gebuehr['gebuehr'];
+		
+	if($user['geld'] < $gebuehr) {
+		displayErrorMessage(NULL,'Nicht genug Geld um am Turnier teilzunehmen!','<a href="index.php">weiter...</a>');
+		return;
+	}
+	
 	if($art == 'klein' && getHallOfFame('Anf&auml;ngerturnier', $user['id'])  >= 2) {
 		displayErrorMessage(NULL,'Du hast das Anf&auml;ngerturnier schon zu oft gewonnen!!!','<a href="index.php">weiter...</a>');
 	}