Added extra logic around natural splitting.