rename comment to whenDone