Moved everything to Buffers to increase performance!