Updated query 12