Figures refactored and new Newtork Concept