Made the buffer list mapping a double letter mapping - avoid conflicts