better hanling messages