m-buffer update -- move to stable.