Fix the adaptation of PART to the new bits of stuff and stuff