Major modifications by CA updated.