better ws handing