Made Query Requirement 4 "work"