changes to trip and sessioncontroller design