added/refactored content of ws2
updates to ws content