Changes for ws-1