added split handling