updated to use connection manager