fixing MultiPurposeList fixed these classes too