Merging in Sean's code and Network description update