Some work done to TripController