Added fill_buffer