Added buffer method