3 - fixed cpp/h