change logic for buffer management