Try out a new simpler buffer list mapping