The best way to handle the new gap inside a connection?