Improvements for class n_t. Not working.