Rewrote queries 2-5