working on WW calculation correction