+ more CD optimisations
+ removed code for connection in trip manager