Change connections to something more natural