finish code for NCM tree, wait for tests