Added tcp and modified ncp a bit