Polished ws + shtuff