Finish & optimize those two partners