Added isFinished