Fixes needed - working from your demo XML