Added changes to Buffer