cleaned up connecting