adaptations to changed connection setup