manage these connections a bit better