Improve around connection