Network Layer modifications added and fixed