Some updates to connection order