Switching to use connect directly.