nw-main updated with new tcp code