Are you going to do a $query to $t_query replacement?