improve message system and change alerts to messages