Incorporate Ron's latest changes.