Adapted to new OCTGN version