Integrating with Ric's change.
Finishing integration.