Updated to be oneway at the other end as well