-\textbf{$payname}\\\r
-\addressline{$company}\r
-\addressline{$address1}\r
-\addressline{$address2}\r
-\addressline{$city, $state $zip}\r
-\addressline{$country}\r
+\textbf{[@-- $payname --@]}\\\r
+\addressline{[@-- $company --@]}\r
+\addressline{[@-- $address1 --@]}\r
+\addressline{[@-- $address2 --@]}\r
+\addressline{[@-- $city --@], [@-- $state --@] [@-- $zip --@]}\r
+\addressline{[@-- $country --@]}\r