updated CMakeLists.txt and grid