better query, more accurate