added query 2 not correctly so far