Secondary connections logic reworked