Making O work more often. Fixing Z.