Latest commit implements the query proposed above