Updated network and refactored loading issue.