Update

Change-Id: I2efb8ac6d8934d80c4a343f55caec4aef69be486
introduced new split function

Change-Id: I41f3c254a5a3e842a6c2b4070368829a81906a6d