Added mustFinish logic