Modified MDictAll.swift