Refactored preparation of xml
Now ms show calculated values