Wajih's networking updates