big rework for connections in agree