refactored messages