FinishState changes