Integrated Ed's changes.