Redo messages a little