buffer_handle improvement to make it accomodate several calls.