More updates in the nonDim
Merged with feature_nondim