changes for nv_math