Partially added last change.