Added repeat until ws