updated legacy w/s def
Merge remote-tracking branch 'origin/master'