Add precautions for no network and no notebook cases
Merge remote changes