Buffering at the right place

and at the right time