Improved Tokenreplce