Updated network and display code