started adding support for external connections