Update for genericized WDWS