Refactored, added Message