Adding Nelson's changes.