Fix probably a bad merge.. This should be the connection object