Test working; update the xml parsing