Added manual ws start feature