Connections reworked