modified for new public_network behavior