added surrogates after rebased