added some diffs and combined some queries