Added isDone Check