Ryccardo changes to partition scheme