New query, updated output