Better ws and tiering