Updated query 5