Wr calculation tweaks