- added remaps for buffers