Improved network structure... Still needing improvments