better mousetrap version of remaking buffers