tweaked mcw_classify
Resolved merge conflicts
Updated simulations