more changes on connection related issue