--- a/concat.xml	Wed Nov 11 12:47:51 2015 -0500
+++ b/concat.xml	Thu Jun 22 18:40:46 2017 -0400
@@ -1,53 +1,47 @@
 <tool id="gops_concat_1" name="Concatenate" version="1.0.1">
-  <description>two datasets into one dataset</description>
-  <requirements>
-    <requirement type="package" version="0.7.1">bx-python</requirement>
-    <requirement type="package" version="1.0.0">galaxy-ops</requirement>
-  </requirements>
-  <command interpreter="python">gops_concat.py $input1 $input2 $output -1 ${input1.metadata.chromCol},${input1.metadata.startCol},${input1.metadata.endCol},${input1.metadata.strandCol} -2 ${input2.metadata.chromCol},${input2.metadata.startCol},${input2.metadata.endCol},${input2.metadata.strandCol} $sameformat</command>
-  <inputs>
-    <param format="interval" name="input1" type="data" help="First dataset">
-      <label>Concatenate</label>
-    </param>
-    <param format="interval" name="input2" type="data" help="Second dataset">
-      <label>with</label>
-    </param>
-    <param name="sameformat" type="boolean" truevalue="--sameformat" falsevalue="" label="Both datasets are same filetype?" checked="true" help="If unchecked Second dataset will be forced into format of First dataset">
-    </param>
-   </inputs>
-  <outputs>
-    <data format="input" name="output" metadata_source="input1" />
-  </outputs>
-  <code file="operation_filter.py"/>
-  <tests>
-    <test>
-      <param name="input1" value="1.bed" />
-      <param name="input2" value="2.bed" />
-      <param name="sameformat" value="true" />
-      <output name="output" file="gops_concat_out1.bed" />     
-    </test>
-    <test>
-      <param name="input1" value="1.bed" />
-      <param name="input2" value="1.interval" />
-      <param name="sameformat" value="false" />
-      <output name="output" file="gops_concat_out2.bed" />     
-    </test>   
-  </tests>
-  <help>
-
+    <description>two datasets into one dataset</description>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <expand macro="requirements" />
+    <code file="operation_filter.py"/>
+    <command><![CDATA[
+python '$__tool_directory__/gops_concat.py'
+'$input1'
+'$input2'
+'$output'
+-1 ${input1.metadata.chromCol},${input1.metadata.startCol},${input1.metadata.endCol},${input1.metadata.strandCol}
+-2 ${input2.metadata.chromCol},${input2.metadata.startCol},${input2.metadata.endCol},${input2.metadata.strandCol}
+$sameformat
+    ]]></command>
+    <inputs>
+        <param name="input1" type="data" format="interval" label="Concatenate" help="First dataset" />
+        <param name="input2" type="data" format="interval" label="With" help="Second dataset" />
+        <param name="sameformat" type="boolean" truevalue="--sameformat" falsevalue="" checked="true" label="Both datasets are in the same format?" help="If unchecked, Second dataset will be forced into the format of First dataset" />
+    </inputs>
+    <outputs>
+        <data name="output" format_source="input1" metadata_source="input1" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="input1" value="1.bed" />
+            <param name="input2" value="2.bed" />
+            <param name="sameformat" value="true" />
+            <output name="output" file="gops_concat_out1.bed" />
+        </test>
+        <test>
+            <param name="input1" value="1.bed" />
+            <param name="input2" value="1.interval" />
+            <param name="sameformat" value="false" />
+            <output name="output" file="gops_concat_out2.bed" />
+        </test>
+    </tests>
+    <help><![CDATA[
 .. class:: infomark
 
 **TIP:** If your dataset does not appear in the pulldown menu -> it is not in interval format. Use "edit attributes" to set chromosome, start, end, and strand columns.
 
------
-
-**Screencasts!**
-
-See Galaxy Interval Operation Screencasts_ (right click to open this link in another window).
-
-.. _Screencasts: http://wiki.g2.bx.psu.edu/Learn/Interval%20Operations
-
------
+@SCREENCASTS@
 
 **Syntax**
 
@@ -58,6 +52,5 @@
 **Example**
 
 .. image:: gops_concatenate.gif
-
-</help>
+    ]]></help>
 </tool>