Improving features of NACHOS