Better buffer list