make the connect to be better
connect be better for 2.3
fix conflict 0816