making connection swappable