Changed messaging behaviour. UI now also makes sense.