updated to work now with connectors