Updated Clayton changes.