--- backgammon.h.orig	Wed Nov 13 22:13:50 2002
+++ backgammon.h	Wed Nov 13 22:15:50 2002
@@ -650,7 +650,6 @@
     CommandSetEvalCandidates( char * ),
     CommandSetEvalCubeful( char * ),
     CommandSetEvalDeterministic( char * ),
-    CommandSetEvalMoveFilter( char *),
     CommandSetEvalNoOnePlyPrune( char * ),
     CommandSetEvalNoise( char * ),    
     CommandSetEvalPlies( char * ),
@@ -721,6 +720,7 @@
     CommandSetMatchID ( char * ),
     CommandSetMessage ( char * ),
     CommandSetMET( char * ),
+    CommandSetMoveFilter( char *),
     CommandSetJacoby( char * ),
     CommandSetNackgammon( char * ),
     CommandSetOutputMatchPC( char * ),
--- gnubg.c.orig	Wed Nov 13 22:08:07 2002
+++ gnubg.c	Wed Nov 13 22:21:15 2002
@@ -374,6 +374,8 @@
     szLIMIT[] = N_("<limit>"),
     szMILLISECONDS[] = N_("<milliseconds>"),
     szMOVE[] = N_("<from> <to> ..."),
+    szFILTER[] = N_ (
+ "<ply> <num. to accept (0 = skip)> [<num. of extra moves to accept> <tolerance>]"),
     szONOFF[] = N_("on|off"),
     szOPTCOMMAND[] = N_("[command]"),
     szOPTFILENAME[] = N_("[filename]"),
@@ -1244,6 +1246,9 @@
       szONOFF, &cOnOff },
     { "met", CommandSetMET,
       N_("Synonym for `set matchequitytable'"), szFILENAME, &cFilename },
+	{ "movefilter", CommandSetMoveFilter, 
+	  N_("Set parameters for choosing moves to evaluate"), 
+	  szFILTER, NULL},
     { "nackgammon", CommandSetNackgammon, N_("Set the starting position"),
       szONOFF, &cOnOff },
     { "output", NULL, N_("Modify options for formatting results"), NULL,
@@ -4228,12 +4233,10 @@
               fAnalyseDice ? "on" : "off",
               fAnalyseMove ? "on" : "off" );
 
-    /* HACK - save move filter under 'set evaluation' */
-    /* we want this to be a global command */
     for (i = 0; i < MAX_FILTER_PLIES; ++i) {
       int j;
       for (j = 0; j <= i; ++j) {
-	fprintf (pf, "set evaluation chequerplay evaluation movefilter %d  %d  %d %d %0.3g\n",
+	fprintf (pf, "set movefilter %d  %d  %d %d %0.3g\n",
 		 i+1, j, 
 		 defaultFilters[i][j].Accept,
 		 defaultFilters[i][j].Extra,
--- set.c.orig	Wed Nov 13 22:08:28 2002
+++ set.c	Wed Nov 13 22:15:50 2002
@@ -68,8 +68,6 @@
     szNAME[] = N_ ("<name>"),
     szNUMBER[] = N_ ("<number>"),
     szONOFF[] = N_ ("on|off"),
-    szFILTER[] = N_ (
- "<ply> <num. to accept (0 = skip)> [<num. of extra moves to accept> <tolerance>]"),
     szPLIES[] = N_ ("<plies>"),
     szSTDDEV[] = N_ ("<std dev>");
     
@@ -91,9 +89,6 @@
       N_("Control how thoroughly deep plies are searched"), szNUMBER, NULL },
     { "tolerance", CommandSetEvalTolerance, N_("Control the equity range "
       "of moves for deep evaluation"), szEQUITY, NULL },
-	{ "movefilter", CommandSetEvalMoveFilter, 
-	  N_("Set parameters for choosing moves to evaluate"), 
-	  szFILTER, NULL},
     { NULL, NULL, NULL, NULL, NULL }
 }, acSetPlayer[] = {
     { "chequerplay", CommandSetPlayerChequerplay, N_("Control chequerplay "
@@ -2261,7 +2256,7 @@
 
 
 extern void
-CommandSetEvalMoveFilter(char* sz) {
+CommandSetMoveFilter(char* sz) {
 
   int		  ply = ParseNumber( &sz );
   int		  level;