MC Expansion

Improve and adding feature that should exist but heven't.