Manually merged code from network implementation to git