Made the changes nessesary to allow for different segmentations of the SPD.