Changes made by Brandon Payne (bpayne@trihydro.com).