some more MultiPart optimization and modification