replaced hunker with cmake too