JH - added dodge ability
merging files