Fix xml
Memory improved