Added splitter and trimmer