query 2 almost done