Overhauled G class stays inside the box