Added buffer functionality again