added message id along with trip and fixed errors in code to reflect