cherry-picked bits