inserted trips
some design fixes