Added time controlled buffering