RENAME classes
faster NN
pass test for NN and NN2opt