Updating to respect finish status