Added is_finished back