Added buffer mods