Merge Ron's changes.