Buffering now does paging, added call back stuff