Upgrading the Yield Machine