updated to use updated cpp utils