introduce new message marking
remove demo code