changed form and xml to new