Changed the way how buffers work!