Replacing buffergator by buffets