changes from ws-1