Added in cherry pick and buf methods