Moved ds2nfu to helperFunctions