MME patch from ent for enhanced demos

Doesn't compile