Merge pull request #580 from dian4554/fix-params

Moved params before <representation>
Fix merge conflicts

author: diane fleming
Merge pull request #582 from dian4554/fix-merge-conflicts

Fix merge conflicts