Upgrade wat_catcher