moving more stuff out of xml file