s/dmandelin/naveed and adding in the needinfo? queries