added new and refactored old messages