Added code for splitter/joiner