Updated to support the working network functionality.