Updated for our network