I should change that for all messages..
Update TODO.