GH-30 updated the code for message packeting