Modify messages
Rethink messages (to task state)