add in buffer message
some love for the buffer
staging env
merge