WIP: new connectivity filter