Update to be snet & branch smart