Final commit for mc runs; everything seems to work.