--- a/flankBed.xml	Fri Aug 18 15:32:52 2017 -0400
+++ b/flankBed.xml	Tue Sep 05 09:51:56 2017 -0400
@@ -1,4 +1,4 @@
-<tool id="bedtools_flankbed" name="FlankBed" version="@WRAPPER_VERSION@.0">
+<tool id="bedtools_flankbed" name="FlankBed" version="@WRAPPER_VERSION@.1">
     <description>create new intervals from the flanks of existing intervals</description>
     <macros>
         <import>macros.xml</import>
@@ -10,7 +10,7 @@
         flankBed
         $pct
         $strand
-        -g $genome
+        -g @GENOME_FILE@
         -i '$input'
 
         #if $addition.addition_select == 'b':
@@ -24,7 +24,7 @@
     </command>
     <inputs>
         <param format="bed,vcf,gff,gff3" name="input" type="data" label="BED/VCF/GFF file"/>
-        <expand macro="genome" />
+        <expand macro="input_conditional_genome_file" />
         <param name="pct" type="boolean" checked="false" truevalue="-pct" falsevalue=""
             label="Define -l and -r as a fraction of the feature’s length"
             help="E.g. if used on a 1000bp feature, -l 0.50, will add 500 bp “upstream”. (-pct)" />
@@ -39,6 +39,7 @@
     <tests>
         <test>
             <param name="input" value="a.bed" ftype="bed" />
+            <param name="genome_file_opts_selector" value="hist" />
             <param name="genome" value="mm9_chr1.len"/>
             <param name="addition_select" value="b"/>
             <param name="b" value="5"/>
@@ -46,6 +47,7 @@
         </test>
         <test>
             <param name="input" value="a.bed" ftype="bed" />
+            <param name="genome_file_opts_selector" value="hist" />
             <param name="genome" value="mm9_chr1.len"/>
             <param name="addition_select" value="lr"/>
             <param name="l" value="2"/>