Added WSS intermediate option