add buffering to temporary storage
add buffering to temporary storage