CherryPick reworked