Restructuring to work better with yoke