Work on #30 by altering the message buffer