More c++ tune