Use new ridley-connectors - don't merge til it's out