Upgraded for OCTGN 3.1.x.x update