Connection state

okie, remove them in next PR.