improved buffer map