Refactored Message again