rework user messages