Update to world class