Modify xml methods, comments some lines