Added XML and removed some comments