Updated nSubstitute