Better handling of welcome, #200