Slight modifications + finding out what's the problem with xml.