added trajectory and parallel; close #2