Alpha version of buffer management