refactor and added messagestamp