Adds in buffer and cherry pick