--- a/hyphy_gard.xml	Thu Mar 21 06:08:04 2019 -0400
+++ b/hyphy_gard.xml	Fri Jun 07 10:20:19 2019 -0400
@@ -1,33 +1,29 @@
 <?xml version="1.0"?>
-<tool id="hyphy_gard" name="HyPhy-GARD" version="@VERSION@+galaxy0">
+<tool id="hyphy_gard" name="HyPhy-GARD" version="2.5.0+galaxy0">
   <description>: Recombination Detection</description>
   <macros>
     <import>macros.xml</import>
   </macros>
-  <expand macro="requirements">
-    <requirement type="package" version="1.0.4">translate-gard</requirement>
-  </expand>
-  <version_command>HYPHYMP --version | tail -n 1 | awk '{print $1}'</version_command>
-  <command detect_errors="exit_code"><![CDATA[
-    export MPI_NODE_COUNT=\${GALAXY_SLOTS:-2} &&
+  <command detect_errors="exit_code">
+  <![CDATA[
     ln -s '$input_file' gard_input.fa &&
-    echo `pwd`/gard_input.fa > tool_params &&
-    echo "010010" >> tool_params &&
-    echo $rate_cond.rate >> tool_params &&
-    #if str($rate_cond.rate) != "1":
-        echo $rate_cond.rate_classes >> tool_params &&
-    #end if
-    echo `pwd`/"gard_input.GARD" >> tool_params &&
-    @HYPHYMPI_INVOCATION@ \$HYPHYMPI_LIB/TemplateBatchFiles/GARD.bf > '$gard_log' &&
-    translate-gard -i gard_input.GARD -j gard_input.GARD.json -o gard_input.fa.translated.json
+    @HYPHY_INVOCATION@ gard
+      --alignment `pwd`/gard_input.fa
+      --type 
+      --code
+      --model
+      --rv '$rate'
+      --rate-classes '$rate_classes'
+
+      > '$gard_log' &&
     ]]></command>
   <inputs>
     <param name="input_file" type="data" format="fasta" label="Input FASTA file"/>
     <conditional name="rate_cond">
       <param name="rate" type="select" label="Rate variation">
-        <option value="1">None</option>
-        <option value="2">General Discrete</option>
-        <option value="3">Beta-Gamma</option>
+        <option value="None">None</option>
+        <option value="GDD">General Discrete</option>
+        <option value="Gamma">Beta-Gamma</option>
       </param>
       <when value="1"/>
       <when value="2">