Added all of ws3 work