Added new conditions to handle other split configurations