Small ws changes