- first attempt to implement WSS as requested in issue #9