Changed the strategy of setup connection