Readded deleted lines from previous commit

And uncommented xml tags