change pattern on how we handle connections