Reverted xml to Solas liking