Moved all the reporting into the buffer