diff --git a/mg/cshrc b/mg/cshrc
index 42405bf..be3cb20 100644
--- a/mg/cshrc
+++ b/mg/cshrc
@@ -1,19 +1,9 @@
-#
-#	Private settings
-#
-setenv PATH $HOME/local_rh_x64/bin:$HOME/bin:$HOME/devel/scripts/mg:$HOME/devel/scripts/bash:$PATH
-
-set lpath=$HOME/local_rh_x64/lib:$HOME/local_rh_x64/lib64
-if ($?LD_LIBRARY_PATH) then
-	setenv LD_LIBRARY_PATH $lpath\:$LD_LIBRARY_PATH
-else
-	setenv LD_LIBRARY_PATH $lpath
-endif
-
 #
 #	MG global
 #
+setenv VCO `/usr/mgc/bin/mgcvco`
 setenv MGC_SITE `domainname`
+
 switch($MGC_SITE:q)
     case amy.mentorg.com:
         source /user/icdet/bin/detalias.arm.csh
@@ -33,21 +23,40 @@ endsw
 
 setenv LM_LICENSE_FILE $MGLS_LICENSE_FILE\:1717@wv-lic-toolworks.wv.mentorg.com
 
+setenv PATH $PATH\:/user/icdet/bin:/user/icbuild/bin
+setenv PATH $PATH\:/user/pevtools/bin:/user/pevtools/$VCO/bin
+setenv PATH $PATH\:/usr/mgc/bin:/usr/mgc/lib/mgcms
+
+setenv LD_LIBRARY_PATH /user/pevtools/$VCO/lib\:$LD_LIBRARY_PATH
+setenv PEVTOOLSBIN /user/pevtools/bin
+
 #
 #	MG development environment
 #
 setenv CVSROOT :pserver:calcvs:/cvs/ic
 setenv BUILD64 1
-setenv VCO `/usr/mgc/bin/mgcvco`
-
-setenv PATH $PATH\:/user/icdet/bin:/user/icbuild/bin:/user/pevtools/bin
-setenv PATH $PATH\:/usr/mgc/bin:/usr/mgc/lib/mgcms
 
 set cpu_count=`/user/icdet/bin/count_processors`
 setenv PB "GMAKE_LIB_PARALLEL=-j$cpu_count GMAKE_SYSTESTS_PARALLEL=-j$cpu_count"
 setenv PB2 "GMAKE_EXEC_PARALLEL=-j"`/user/icdet/bin/figure_gmake_exec_ness`
 alias pmake 'gmake $PB $PB2'
 
+#
+#	MG test environment (These are needed for terra)
+#
+setenv DESIGN_DIR /user/pevtools/data_dir
+setenv DFM_TEST_BASE /wv/cal_dfm_qa/tot_master/calibre/dfm/rq/
+
+#export MGC_HOME=/amy/cal_nightly/latest/ic/ic_superproj/$VCO/Mgc_home
+#export MGC_HOME=/wv/icdet/work_areas/latest_ube/ic/ic_superproj/$VCO/Mgc_home/
+#export MGC_BIN=$MGC_HOME/bin
+#export PATH=$MGC_BIN:$PATH
+
+setenv TEST_SUITE_TOP=/wv/amy_dfm_qa/tot_master/calibre
+setenv CALIBRE_SKIP_OS_CHECKS=1
+source /wv/calgrid/sge/default/common/settings.csh
+setenv SGE_ROOT /wv/calgrid/uge811
+
 #
 #	VTune
 #
@@ -60,6 +69,12 @@ if ( -x /opt/intel/inspector_xe_2011/inspxe-vars.sh ) then
 	source /opt/intel/inspector_xe_2011/inspxe-vars.sh
 endif
 
+#
+#	Private settings
+#
+setenv PATH $HOME/local_rh_x64/bin:$HOME/bin:$HOME/devel/scripts/mg:$HOME/devel/scripts/bash:$PATH
+setenv LD_LIBRARY_PATH $HOME/local_rh_x64/lib:$HOME/local_rh_x64/lib64\:$LD_LIBRARY_PATH
+
 #
 #	ICWBEV
 #
@@ -85,22 +100,10 @@ alias oasis_info $HOME/local_rh_x64/private/fw/bin/oasis_info
 #        export DISPLAY=$REMOTEHOST:0.0
 #    fi
 # fi
-
 #####################
-
-#  export MGC_HOME=/amy/cal_nightly/latest/ic/ic_superproj/aoi/Mgc_home
-#  export MGC_BIN=$MGC_HOME/bin
-#  export PATH=$MGC_BIN:$PATH
-
-  #echo "PATH = $PATH"
-
 #  export MGC_AMS_HOME=/tools/ELDO
 #  export PATH=$PATH:$MGC_AMS_HOME/bin
 #####################
-
-#  export STRESS_HOME=/home/hhovsepy/Research/mgcstress
-#  export SPICESIM=/home/hhovsepy/Research/tsmc45spice
-#  export PATH=$SPICESIM:$STRESS_HOME:$PATH
 #for review-board
 #  export PATH=/tools/ActivePython-2.5.4.4.x86_64/bin/:$PATH