Restructing, Network added, added format functions