Extended work on network mode