Seperated connect logic