added surrogates to reparse