Updated to handle the transition between splits and decisions
Updated per code review