Add label to waiting
Implement stop waiting