some more MultiPart optimization