Added simple buffer