slight reworking of nonlinearity registry