affter revert fix and try add internal message record, not done yet