Some changes from MC