join update

Now has channel filtering