v1.21 some text modification