added select trips
merged master