--- a/bmsb.xml	Thu Dec 15 11:04:41 2016 -0500
+++ b/bmsb.xml	Fri Dec 16 08:50:41 2016 -0500
@@ -6,54 +6,52 @@
     </requirements>
     <command>
         <![CDATA[
-            Rscript $__tool_directory__/BMSB.R
-            -adult_mort $adult_mort
-            -adult_nymph_accum $adult_nymph_accum
-            -egg_mort $egg_mort
-            -latitude $latitude
-            -location $location
-            -max_clutch_size $max_clutch_size
-            -min_clutch_size $min_clutch_size
-            -nymph_mort $nymph_mort
-            -old_nymph_accum $old_nymph_accum
-            -output $output
-            -oviposition $oviposition
-            -photoperiod $photoperiod
-            -replications $replications
-            -se_plot $se_plot
-            -sim_year $sim_year
-            -start_year $start_year
-            -temperature_datasets "$temperature_datasets"
-            -young_nymph_accum $young_nymph_accum
+            Rscript $__tool_directory__/bmsb.R
+            -a $adult_mort
+            -b $adult_nymph_accum
+            -c $egg_mort
+            -d $latitude
+            -e $location
+            -f $max_clutch_size
+            -g $min_clutch_size
+            -j $nymph_mort
+            -k $old_nymph_accum
+            -o $output
+            -p $oviposition
+            -q $photoperiod
+            -s $replications
+            -t $se_plot
+            -u $year
+            -v "$temperature_dataset"
+            -y $young_nymph_accum
         ]]>
     </command>
     <inputs>
         <param name="location" type="select" label="Select a location">
-            <option value="asheville" selected=True>Asheville</option>
+            <option value="asheville" selected="True">Asheville</option>
             <option value="wenatchee">Wenatchee</option>
         </param>
-        <param name="latitude" type="float" value="35.60" label="Latitude of selected location">
-        <param name="temperature_datasets" type="data" format="csv" multiple="true" label="Select datasets containing temperatures" help="One or more datasets can be selected"/>
-        <param name="start_year" type="integer" min="1990" label="Enter a starting year" />
+        <param name="latitude" type="float" value="35.60" label="Latitude of selected location" />
+        <param name="temperature_dataset" type="data" format="csv" label="Select dataset containing temperatures" />
+        <param name="year" type="integer" value="2004" min="1990" label="Enter the year for the temperature data" />
         <param name="replications" type="integer" value="3" label="Number of replications" />
-        <param name="photoperiod" type="float" value="13.5" label="Critical photoperiod for diapause induction/termination">
-        <param name="egg_mort" type="integer" label="Adjustment rate for egg mortality" />
-        <param name="nymph_mort" type="integer" label="Adjustment rate for nymph mortality" />
-        <param name="adult_mort" type="integer" label="Adjustment rate for adult mortality" />
-        <param name="oviposition" type="integer" label="Adjustment oviposition rate" />
-        <param name="min_clutch_size" type="integer" label="Adjustment of minimum clutch size" />
-        <param name="max_clutch_size" type="integer" label="Adjustment of maximum clutch size" />
-        <param name="young_nymph_accum" type="integer" label="Adjustment of DD accumulation (egg->young nymph)" />
-        <param name="old_nymph_accum" type="integer" label="Adjustment of DD accumulation (young nymph->old nymph)" />
-        <param name="adult_nymph_accum" type="integer" label="Adjustment of DD accumulation (old nymph->adult)" />
-        <param name="sim_year" type="integer" min="1990" label="Simulation year" />
+        <param name="photoperiod" type="float" value="13.5" label="Critical photoperiod for diapause induction/termination" />
+        <param name="egg_mort" type="integer" value="1" label="Adjustment rate for egg mortality" />
+        <param name="nymph_mort" type="integer" value="1" label="Adjustment rate for nymph mortality" />
+        <param name="adult_mort" type="integer" value="1" label="Adjustment rate for adult mortality" />
+        <param name="oviposition" type="integer" value="1" label="Adjustment oviposition rate" />
+        <param name="min_clutch_size" type="integer" value="0" label="Adjustment of minimum clutch size" />
+        <param name="max_clutch_size" type="integer" value="0" label="Adjustment of maximum clutch size" />
+        <param name="young_nymph_accum" type="integer" value="0" label="Adjustment of DD accumulation (egg->young nymph)" />
+        <param name="old_nymph_accum" type="integer" value="0" label="Adjustment of DD accumulation (young nymph->old nymph)" />
+        <param name="adult_nymph_accum" type="integer" value="0" label="Adjustment of DD accumulation (old nymph->adult)" />
         <param name="se_plot" type="select" label="Plot SE?">
-            <option value="0" selected=True>No</option>
+            <option value="0" selected="True">No</option>
             <option value="1">Yes</option>
         </param>
     </inputs>
     <outputs>
-        <data name="output" format="RData" label="${tool.name}: ${location}, ${sim_year} on ${on_string}" />
+        <data name="output" format="pdf" label="${tool.name} ${location}:${year} on ${on_string}" />
     </outputs>
     <help>
 **What it does**