UparseWrapperFunction I cleaned and updated these functions