add more support for TS6 welcome