adjusted manifest and CMakeList