Improvements on MC
Merged