updated xml after discusiing with Alexey and Konstantin. Includes Darryn's and Ben's comments as well.