Committing updated channel code and refined nsdutility