added tern back, removed XMLFolding