Modified splitter and token updated