NDS looks ok, need autotests