Need to switch to waiting immediately after done.