diff --git a/Trigger/TrigFTK/TrigFTKSim/python/FTKSimOptions.py b/Trigger/TrigFTK/TrigFTKSim/python/FTKSimOptions.py
index 34dfff063170b517a28f80f7b877b89717f495c7..364fdd2092278799a5e24f7c7bc978453a3c7933 100644
--- a/Trigger/TrigFTK/TrigFTKSim/python/FTKSimOptions.py
+++ b/Trigger/TrigFTK/TrigFTKSim/python/FTKSimOptions.py
@@ -3,8 +3,16 @@
 import PyJobTransforms.trfExceptions as trfExceptions
 import PyJobTransforms.trfArgClasses as trfArgClasses
 
+
+def addTrigFTKAthenaOptions(parser):
+    parser.defineArgGroup('Athena', 'General Athena Options')
+    parser.add_argument('--asetup', group='Athena', type=trfArgClasses.argFactory(trfArgClasses.argSubstep, runarg=False), nargs='+', metavar='substep:ASETUP',
+                        help='asetup command string to be run before this substep is executed')
+    return None
+
 def addTrigFTKSimOptions(parser,nsubregions=4):
     parser.defineArgGroup('TrigFTKSim', 'Fast tracker simulation generic options')
+
     parser.add_argument('--NBanks', type=trfArgClasses.argFactory(trfArgClasses.argInt, runarg=True),
                         help='Number of pattern banks', group='TrigFTKSim')
     # Here we set a default value as the merger wants this explicitly
diff --git a/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM32SM1Un_tf.py b/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM32SM1Un_tf.py
index eedc64f93b64aca8d8a7a3a45d13ccb43c04c1cf..2359842feeb7f333b4a5b46f995df2e3723f32e2 100755
--- a/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM32SM1Un_tf.py
+++ b/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM32SM1Un_tf.py
@@ -18,7 +18,7 @@ msg.info('logging set in %s' % sys.argv[0])
 from PyJobTransforms.trfExitCodes import trfExit
 from PyJobTransforms.transform import transform
 from PyJobTransforms.trfExe import athenaExecutor
-from PyJobTransforms.trfArgs import addAthenaArguments
+from PyJobTransforms.trfArgs import addDetectorArguments
 from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
 
 import PyJobTransforms.trfExceptions as trfExceptions
@@ -127,7 +127,8 @@ def getTransform():
                                 'subregions merge and final merge.'.format(
                                     ntowers, subregions))
 
-    #addAthenaArguments(trf.parser)
+    addTrigFTKAthenaOptions(trf.parser)
+    addDetectorArguments(trf.parser)
     addTrigFTKSimOptions(trf.parser, nsubregions=subregions)
     addTrigFTKSimMergeOptions(trf.parser);
     addTrigFTKSimTFOptions(trf.parser)
diff --git a/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM32SM4Un_tf.py b/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM32SM4Un_tf.py
index 5456c1fe6632015db1ce9009b6539a1207a345f2..e0537a92d9361f7d9354246882db7448790693cf 100755
--- a/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM32SM4Un_tf.py
+++ b/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM32SM4Un_tf.py
@@ -18,7 +18,7 @@ msg.info('logging set in %s' % sys.argv[0])
 from PyJobTransforms.trfExitCodes import trfExit
 from PyJobTransforms.transform import transform
 from PyJobTransforms.trfExe import athenaExecutor
-from PyJobTransforms.trfArgs import addAthenaArguments
+from PyJobTransforms.trfArgs import addDetectorArguments
 from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
 
 import PyJobTransforms.trfExceptions as trfExceptions
@@ -141,7 +141,8 @@ def getTransform():
                                 'subregions merge and final merge.'.format(
                                     ntowers, subregions))
 
-    #addAthenaArguments(trf.parser)
+    addTrigFTKAthenaOptions(trf.parser)
+    addDetectorArguments(trf.parser)
     addTrigFTKSimOptions(trf.parser, nsubregions=subregions)
     addTrigFTKSimMergeOptions(trf.parser);
     addTrigFTKSimTFOptions(trf.parser)
diff --git a/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM64SM1Un_tf.py b/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM64SM1Un_tf.py
index e3b68bfec7a8deb58bae1c88cbb2d42456fd2729..31042b102ba6437109312b37617fac9ff433c976 100755
--- a/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM64SM1Un_tf.py
+++ b/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM64SM1Un_tf.py
@@ -18,7 +18,8 @@ msg.info('logging set in %s' % sys.argv[0])
 from PyJobTransforms.trfExitCodes import trfExit
 from PyJobTransforms.transform import transform
 from PyJobTransforms.trfExe import athenaExecutor
-from PyJobTransforms.trfArgs import addAthenaArguments
+from PyJobTransforms.trfArgs import addDetectorArguments
+
 from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
 
 import PyJobTransforms.trfExceptions as trfExceptions
@@ -127,7 +128,8 @@ def getTransform():
                                 'subregions merge and final merge.'.format(
                                     ntowers, subregions))
 
-    #addAthenaArguments(trf.parser)
+    addTrigFTKAthenaOptions(trf.parser)
+    addDetectorArguments(trf.parser)
     addTrigFTKSimOptions(trf.parser, nsubregions=subregions)
     addTrigFTKSimMergeOptions(trf.parser);
     addTrigFTKSimTFOptions(trf.parser)
diff --git a/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM64SM4Un_tf.py b/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM64SM4Un_tf.py
index 7724e668011b95c79b4f318ee9551b000a3292ce..c02cdb8e2c47503f402ca7b677b9ebdc9b7f0e27 100755
--- a/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM64SM4Un_tf.py
+++ b/Trigger/TrigFTK/TrigFTKSim/scripts/TrigFTKTM64SM4Un_tf.py
@@ -18,8 +18,8 @@ msg.info('logging set in %s' % sys.argv[0])
 from PyJobTransforms.trfExitCodes import trfExit
 from PyJobTransforms.transform import transform
 from PyJobTransforms.trfExe import athenaExecutor
-from PyJobTransforms.trfArgs import addAthenaArguments
 from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
+from PyJobTransforms.trfArgs import addDetectorArguments
 
 import PyJobTransforms.trfExceptions as trfExceptions
 import PyJobTransforms.trfArgClasses as trfArgClasses
@@ -150,12 +150,14 @@ def getTransform():
                                 'subregions merge and final merge.'.format(
                                     ntowers, subregions))
 
-    #addAthenaArguments(trf.parser)
+    addTrigFTKAthenaOptions(trf.parser)
+    addDetectorArguments(trf.parser)
     addTrigFTKSimOptions(trf.parser, nsubregions=subregions)
     addTrigFTKSimMergeOptions(trf.parser);
     addTrigFTKSimTFOptions(trf.parser)
     addTrigFTKSimRFOptions(trf.parser)
     addFTKSimulationArgs(trf.parser)
+    
     return trf
 
 
diff --git a/Trigger/TrigFTK/TrigFTKSim/share/skeleton.BS_FTK_Creator.py b/Trigger/TrigFTK/TrigFTKSim/share/skeleton.BS_FTK_Creator.py
index 252856bcd68f748b20572c9d779c044ca69f1396..241859de0f56dd1bf52fcc11fbf0cff37433738d 100755
--- a/Trigger/TrigFTK/TrigFTKSim/share/skeleton.BS_FTK_Creator.py
+++ b/Trigger/TrigFTK/TrigFTKSim/share/skeleton.BS_FTK_Creator.py
@@ -39,12 +39,15 @@ if hasattr(runArgs, "skipEvents"):
 elif hasattr(runArgs, "firstEvent"):
     athenaCommonFlags.SkipEvents.set_Value_and_Lock(runArgs.firstEvent)
 
+from AthenaCommon.GlobalFlags import jobproperties
 from AthenaCommon.GlobalFlags import globalflags
 globalflags.InputFormat="bytestream"
-from AthenaCommon.GlobalFlags import jobproperties
-###jobproperties.Global.ConditionsTag.set_Value_and_Lock ('CONDBR2-BLKPA-2015-11')
-###jobproperties.Global.DetDescrVersion.set_Value_and_Lock("ATLAS-R2-2015-03-01-00")
+if hasattr(runArgs,"geometryVersion"):
+   globalflags.DetDescrVersion.set_Value_and_Lock(runArgs.geometryVersion)
 
+if hasattr(runArgs,"conditionsTag"):
+   globalflags.ConditionsTag.set_Value_and_Lock(runArgs.conditionsTag)
+   
 inputNTUP_FTKFile = runArgs.inputNTUP_FTKFile
 
 from TrigFTK_RawDataAlgs.TrigFTK_RawDataAlgsConf import FTK_RDO_CreatorAlgo
@@ -84,7 +87,6 @@ jobproperties.LArRODFlags.doLArFebErrorSummary.set_Value_and_Lock(False)
 # main jobOption
 include ("RecExCommon/RecExCommon_topOptions.py")
 
-
 StreamBSFileOutput.ItemList = ["FTK_RawTrackContainer#*"]
 
 # Merge with original bytestream