Added need_trajectory param to get_sub