Integrating in the new string generation code.