Major rewrite of mc example