Update changes from feedback and add MC code