Support-WWF-to-save-17

Support WWF sooner than later-7