fixed the merges from  NTs branch