xml refactored for 6.0!