final changes on connectionmanager