Reintroduced buffering