Buffer is now more flexible