Changing back to CMake