Added improve for text2