Removed the MC, added a few comments