Added second part of the buffer for testing