WoF system changes aimed at saving