Tune and separate cherry-pick examples