modify message offset, and messages
merge other commits