added modified xml and queries