Refactored fired messages.
update