CMA.cpp now in its original state