big XML changes complete