removed Individual, some trip view changes