adding support for multiple connections