simplify connectors even further