Partial update to connectivity

Also update in t2b