done! + bug with xml