Adding MM performance modifications