work on error handling in network
merge